Merge remote-tracking branch 'upstream/2.3'

mixxxdj · Jul 5, 2020 · ff59964 · ff59964
2 parents 1621716 + 1621294
commit ff59964
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/test/effectchainslottest.cpp b/src/test/effectchainslottest.cpp
@@ -35,6 +35,7 @@ TEST_F(EffectChainSlotTest, ChainSlotMirrorsLoadedChain) {
 
     StandardEffectRackPointer pRack = m_pEffectsManager->addStandardEffectRack();
     EffectChainSlotPointer pChainSlot = pRack->getEffectChainSlot(iChainNumber);
+    pChainSlot->registerInputChannel(m_master);
 
     QString group = StandardEffectRack::formatEffectChainSlotGroupString(
         iRackNumber, iChainNumber);

diff --git a/src/test/taglibtest.cpp b/src/test/taglibtest.cpp
@@ -15,10 +15,11 @@ class TagLibTest : public testing::Test {
   protected:
     static QString generateTemporaryFileName(const QString& fileNameTemplate) {
         QTemporaryFile tmpFile(fileNameTemplate);
-        tmpFile.setAutoRemove(true);
+        // The file must be opened to create it and to obtain
+        // its file name!
         tmpFile.open();
-        DEBUG_ASSERT(tmpFile.exists());
         const QString tmpFileName = tmpFile.fileName();
+        DEBUG_ASSERT(!tmpFileName.isEmpty());
         return tmpFileName;
     }