Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59

Change-Id: If4869664ad4cbb5ec56e7c306f47d0bf0f1f075c

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py
index 4f1b4fedd32..0915f02fcc2 100644
--- a/tests/system/suite_tools/tst_codepasting/test.py
+++ b/tests/system/suite_tools/tst_codepasting/test.py
@@ -35,7 +35,6 @@ def __platformToBeRunToday__():
 skipPastingToPastebinCom = platform.system() not in __platformToBeRunToday__()
 
 NAME_PBCOM = "Pastebin.Com"
-NAME_PCXYZ = "Pastecode.Xyz"
 
 serverProblems = "Server side problems."
 
@@ -129,7 +128,7 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
         closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog')
         return -1
     waitFor("pasteModel.rowCount() > 1", 20000)
-    if (not skippedPasting and not any(map(lambda str:pasteId in str, dumpItems(pasteModel)))):
+    if (protocol != NAME_PBCOM and not skippedPasting and not any(map(lambda str:pasteId in str, dumpItems(pasteModel)))):
         test.warning("Fetching too fast for server of %s - waiting 3s and trying to refresh." % protocol)
         snooze(3)
         clickButton("{text='Refresh' type='QPushButton' unnamed='1' visible='1' "
@@ -152,7 +151,11 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
                             "Verify that line in list of pastes contains the description")
         except:
             if not skippedPasting:
-                test.fail("Could not find id '%s' in list of pastes from %s" % (pasteId, protocol))
+                message = "Could not find id '%s' in list of pastes from %s" % (pasteId, protocol)
+                if protocol == NAME_PBCOM:
+                    test.xfail(message, "pastebin.com does not show pastes in list anymore")
+                else:
+                    test.fail(message)
             foundSnippet = False
             replaceEditorContent(waitForObject(":PasteSelectDialog.pasteEdit_QLineEdit"), pasteId)
     if foundSnippet:
@@ -165,7 +168,7 @@ def main():
     startQC()
     if not startedWithoutPluginError():
         return
-    protocolsToTest = [NAME_PBCOM, NAME_PCXYZ]
+    protocolsToTest = [NAME_PBCOM]
     sourceFile = os.path.join(os.getcwd(), "testdata", "main.cpp")
     # make sure General Messages is open
     openGeneralMessages()