birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{SPEC-7465} Fix DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds (#1535)

Browse Source 
* Fix for DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds
* added -ap_disableAssetTreeView=true to disable the Qt tree view for the asset tab to get the parts that want to be tested finish
* only shows up on Debug

Tests:
=== test session starts ===
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_AllPlatforms::test_AllSupportedPlatforms_FastScanWorks_FasterThanFullScan[windows-AutomatedTesting] PASSED [ 50%]
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_Windows::test_WindowsPlatforms_RunAPBatchAndConnectGui_RunsWithoutEditor[windows-AutomatedTesting] PASSED [100%]
--- generated xml file: F:\amazon\o3de\build\vs2019\Testing\Pytest\AssetPipelineTests.Batch_2_Sandbox.xml ---
=== 2 passed, 4 deselected in 18.32s ===
This commit is contained in:
jackalbe
2021-06-24 06:47:59 -05:00
committed by GitHub
parent 95313401ed
commit 143b8f1131
3 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp
+42 -21
View File
@@ -11,12 +11,13 @@
#include <AzCore/Component/TickBus.h>
#include <AzCore/IO/Path/Path.h>
#include <native/utilities/assetUtils.h>
#include <AzCore/Console/IConsole.h>
namespace AssetProcessor
{
AZ_CVAR(bool, ap_disableAssetTreeView, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Disable asset tree for automated tests.");
SourceAssetTreeModel::SourceAssetTreeModel(AZStd::shared_ptr<AzToolsFramework::AssetDatabase::AssetDatabaseConnection> sharedDbConnection, QObject *parent) :
SourceAssetTreeModel::SourceAssetTreeModel(AZStd::shared_ptr<AzToolsFramework::AssetDatabase::AssetDatabaseConnection> sharedDbConnection, QObject* parent) :
AssetTreeModel(sharedDbConnection, parent)
{
}
@@ -27,15 +28,20 @@ namespace AssetProcessor
void SourceAssetTreeModel::ResetModel()
{
if (ap_disableAssetTreeView)
{
return;
}
m_sourceToTreeItem.clear();
m_sourceIdToTreeItem.clear();
m_sharedDbConnection->QuerySourceAndScanfolder(
[&](AzToolsFramework::AssetDatabase::SourceAndScanFolderDatabaseEntry& sourceAndScanFolder)
{
AddOrUpdateEntry(sourceAndScanFolder, sourceAndScanFolder, true);
return true; // return true to continue iterating over additional results, we are populating a container
});
{
AddOrUpdateEntry(sourceAndScanFolder, sourceAndScanFolder, true);
return true; // return true to continue iterating over additional results, we are populating a container
});
}
void SourceAssetTreeModel::AddOrUpdateEntry(
@@ -128,16 +134,21 @@ namespace AssetProcessor
void SourceAssetTreeModel::OnSourceFileChanged(const AzToolsFramework::AssetDatabase::SourceDatabaseEntry& entry)
{
if (ap_disableAssetTreeView)
{
return;
}
// Model changes need to be run on the main thread.
AZ::SystemTickBus::QueueFunction([&, entry]()
{
m_sharedDbConnection->QueryScanFolderBySourceID(entry.m_sourceID,
[&, entry](AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry& scanFolder)
{
AddOrUpdateEntry(entry, scanFolder, false);
return true;
m_sharedDbConnection->QueryScanFolderBySourceID(entry.m_sourceID,
[&, entry](AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry& scanFolder)
{
AddOrUpdateEntry(entry, scanFolder, false);
return true;
});
});
});
}
void SourceAssetTreeModel::RemoveFoldersIfEmpty(AssetTreeItem* itemToCheck)
@@ -182,22 +193,32 @@ namespace AssetProcessor
void SourceAssetTreeModel::OnSourceFileRemoved(AZ::s64 sourceId)
{
if (ap_disableAssetTreeView)
{
return;
}
// UI changes need to be done on the main thread.
AZ::SystemTickBus::QueueFunction([&, sourceId]()
{
auto existingSource = m_sourceIdToTreeItem.find(sourceId);
if (existingSource == m_sourceIdToTreeItem.end() || !existingSource->second)
{
// If the asset being removed wasn't previously cached, then something has gone wrong. Reset the model.
Reset();
return;
}
RemoveAssetTreeItem(existingSource->second);
});
auto existingSource = m_sourceIdToTreeItem.find(sourceId);
if (existingSource == m_sourceIdToTreeItem.end() || !existingSource->second)
{
// If the asset being removed wasn't previously cached, then something has gone wrong. Reset the model.
Reset();
return;
}
RemoveAssetTreeItem(existingSource->second);
});
}
QModelIndex SourceAssetTreeModel::GetIndexForSource(const AZStd::string& source)
{
if (ap_disableAssetTreeView)
{
return QModelIndex();
}
auto sourceItem = m_sourceToTreeItem.find(source);
if (sourceItem == m_sourceToTreeItem.end())
{