Merge lp:~ken-vandine/content-hub/url-dispatcher-tests into lp:content-hub

[Ken VanDine]

Make the import and share testability peers return 1 if the transfer is aborted.
Added url-dispatcher autopkgtest.

Make the import and share testability peers return 1 if the transfer is aborted.
Added url-dispatcher autopkgtest.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/content-hub-ci/258/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/258/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes I did, however the changes are all testing related

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * I'm a core-dev, added autopkgtests

[Michael Sheldon (michael-sheldon)]

It might be nice to have a test that tries to export a file:// URI (with the expectation that it fails), to ensure no change accidentally enables that in the future.

[Michael Sheldon (michael-sheldon)]

dobey had a couple of comments on IRC:

<dobey> dbus itself doesn't require X, and i don't think the other commands being used do either
<dobey> would probably be better if each test was pulled out to individual tests, and they were run using dbus-test-runner or similar
<dobey> this level of integration testing could probably also be run during the build of the package as well

review: Needs Fixing

[lp:~ken-vandine/content-hub/url-dispatcher-tests]

216. By Ken VanDine on 2015-06-05

Added autopkgtest to verify that file uris are rejected from url-dispatcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:216
http://jenkins.qa.ubuntu.com/job/content-hub-ci/259/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/55

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/259/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes (tested new autopkgtests with adt-run)

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'debian/tests/control'
--- debian/tests/control	2015-06-01 20:06:07 +0000
+++ debian/tests/control	2015-06-05 17:30:59 +0000
@@ -1,3 +1,3 @@
-Tests: aa-check
+Tests: aa-check url-dispatcher
 Depends: content-hub-testability, dbus-x11, xvfb
 Restrictions: allow-stderr

=== added file 'debian/tests/url-dispatcher'
--- debian/tests/url-dispatcher	1970-01-01 00:00:00 +0000
+++ debian/tests/url-dispatcher	2015-06-05 17:30:59 +0000
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# start X
+(Xvfb :5 >/dev/null 2>&1 &)
+XVFB_PID=$!
+export DISPLAY=:5
+
+# start local session D-BUS
+eval `dbus-launch`
+trap "kill $DBUS_SESSION_BUS_PID $XVFB_PID" 0 TERM QUIT INT
+export DBUS_SESSION_BUS_ADDRESS
+export XAUTHORITY=/dev/null
+
+FAILED=""
+
+content-hub-test-sharer &2>/dev/null
+content-hub-send "content:?pkg=content-hub-test-sharer&handler=share&text=text" 2>/dev/null
+if [ $? -ne 0 ]; then
+    FAILED="$FAILED share"
+fi
+
+content-hub-test-importer &2>/dev/null
+content-hub-send "content:?pkg=content-hub-test-importer&handler=export&text=text" 2>/dev/null
+if [ $? -ne 0 ]; then
+    FAILED="$FAILED import"
+fi
+
+content-hub-send "content:?pkg=content-hub-test-importer&handler=export&url=file:///etc/issue" 2>/dev/null
+if [ $? -eq 0 ]; then
+    FAILED="$FAILED reject-files"
+fi
+
+if [ -z "$FAILED" ]; then
+    echo "All tests passed"
+    exit 0
+else
+    echo "$FAILED failed"
+    exit 1
+fi
+

=== modified file 'tests/peers/importer/autoimporter.cpp'
--- tests/peers/importer/autoimporter.cpp	2015-04-14 15:28:56 +0000
+++ tests/peers/importer/autoimporter.cpp	2015-06-05 17:30:59 +0000
@@ -65,6 +65,9 @@
 
     qDebug() << Q_FUNC_INFO << "STATE:" << transfer->state();
 
+    if (transfer->state() == cuc::Transfer::aborted)
+        QCoreApplication::instance()->exit(1);
+
     if (transfer->state() == cuc::Transfer::collected)
-        QCoreApplication::instance()->quit();
+        QCoreApplication::instance()->exit(0);
 }

=== modified file 'tests/peers/sharer/autosharer.cpp'
--- tests/peers/sharer/autosharer.cpp	2015-04-14 15:28:56 +0000
+++ tests/peers/sharer/autosharer.cpp	2015-06-05 17:30:59 +0000
@@ -65,8 +65,11 @@
 
     qDebug() << Q_FUNC_INFO << "STATE:" << transfer->state();
 
+    if (transfer->state() == cuc::Transfer::aborted)
+        QCoreApplication::instance()->exit(1);
+
     if (transfer->state() == cuc::Transfer::collected)
-        QCoreApplication::instance()->quit();
+        QCoreApplication::instance()->exit(0);
 }
 
 

=== modified file 'tools/send/autoexporter.cpp'
--- tools/send/autoexporter.cpp	2015-05-14 18:50:18 +0000
+++ tools/send/autoexporter.cpp	2015-06-05 17:30:59 +0000
@@ -74,6 +74,8 @@
     cuc::Transfer *transfer = static_cast<cuc::Transfer*>(sender());
     TRACE() << Q_FUNC_INFO << "STATE:" << transfer->state();
 
+    if (transfer->state() == cuc::Transfer::aborted)
+        QCoreApplication::instance()->exit(1);
     if (transfer->state() == cuc::Transfer::collected)
-        QCoreApplication::instance()->quit();
+        QCoreApplication::instance()->exit(0);
 }