diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-05-15 17:20:20 +0200 |
commit | aa79d30b83fc79e8e18af4da0062ddf21fcd201f (patch) | |
tree | f97fe44d83aa76a9c2629039aa44ebef82d5d91b /tests | |
parent | 765d3a6bc0343f3f26f9d2dbd65373b29f07177f (diff) | |
parent | 7051ba84984b20676ef2de07349e56b0d7bdfa8c (diff) |
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0
Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
Diffstat (limited to 'tests')
-rw-r--r-- | tests/system/suite_tools/tst_codepasting/test.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index 4f1b4fedd3..42eb3ef8b0 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -129,7 +129,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 +152,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: |