ubuntu-touch-coreapps-reviewers team mailing list archive

[Nicholas Skaggs <nskaggs@xxxxxxxxxx>]

Nicholas Skaggs has proposed merging lp:~nskaggs/ubuntu-clock-app/remove-internet-worldclock-unit-test into lp:ubuntu-clock-app.

Commit message:
Remove test that requires internet inside unit tests

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~nskaggs/ubuntu-clock-app/remove-internet-worldclock-unit-test/+merge/264760

Remove test that requires internet inside unit tests

Launchpad builders can't access the internet. Internet enabled tests should be run at a higher level. Since the base functionality is otherwise tested in the testsuite, this test can be considered redundant and can be removed.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nskaggs/ubuntu-clock-app/remove-internet-worldclock-unit-test into lp:ubuntu-clock-app.

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2015-03-31 19:03:09 +0000
+++ tests/unit/CMakeLists.txt	2015-07-14 20:56:46 +0000
@@ -10,7 +10,7 @@
 
 macro(DECLARE_QML_TEST TST_NAME TST_QML_FILE)
     if(USE_XVFB)
-        set(COMMAND_PREFIX ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24")
+        set(COMMAND_PREFIX ${XVFB_RUN_BIN} -a -s "-screen 0 400x600x24")
     else()
         set(COMMAND_PREFIX "")
     endif()

=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml	2014-10-14 09:45:06 +0000
+++ tests/unit/tst_alarm.qml	2015-07-14 20:56:46 +0000
@@ -131,10 +131,11 @@
                 var alarmTime = findChild(alarmsList, "listAlarmTime"+i)
                 var alarmStatus = findChild(alarmsList, "listAlarmStatus"+i)
 
-                if (label === alarmLabel.text
-                        && time === alarmTime.text
-                        && repeat === alarmRepeat.text
-                        && status === alarmStatus.checked)
+                if (label && alarmLabel &&
+                    label === alarmLabel.text
+                    && time === alarmTime.text
+                    && repeat === alarmRepeat.text
+                    && status === alarmStatus.checked)
                 {
                     return i;
                 }

=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml	2014-10-14 11:33:23 +0000
+++ tests/unit/tst_worldClock.qml	2015-07-14 20:56:46 +0000
@@ -166,29 +166,5 @@
             // Clean up after the test by deleting the city which was added during the test
             deleteWorldCity("Amsterdam", "Netherlands")
         }
-
-        /*
-         Test to check if a city now found in the world city list can be added
-         by searcing it online and then adding it from the results returned.
-        */
-        function test_addCityBySearchingOnline() {
-            var clockPage = getPage(pageStack, "clockPage")
-
-            pressAddWorldCityButton()
-
-            var worldCityPage = getPage(pageStack, "worldCityList")
-            waitForRendering(worldCityPage)
-
-            /*
-             #TODO: Jenkins machine may run in a confined environment with no
-             access to internet to run this function. Ideally we should mock
-             the data given to this function.
-            */
-            addCityBySearchingOnline("Venice", "Provincia di Venezia, Veneto, Italy")
-            assertWorldCityAddition("Venice", " Veneto, Italy")
-
-            // Clean up after the test by deleting the city which was added during the test
-            deleteWorldCity("Venice", " Veneto, Italy")
-        }
     }
 }