Merge lp:~brendan-donegan/checkbox/remerge_1939_1965 into lp:checkbox

[Brendan Donegan]

This merge reintroduces the changes from previously backed out revisions 1939 and 1965. These can now be merged.

[Zygmunt Krynicki (zyga)]

Thanks, +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-12 17:45:14 +0000
+++ debian/changelog	2013-04-15 10:09:25 +0000
@@ -4,6 +4,12 @@
   * jobs/miscellanea.txt.in: Added jobs for manual verification of PXE boot and
     remote IPMI to improve server test coverage.
 
+  [ Brendan Donegan ]
+  * scripts/sources_test - modified script so that it takes sources list
+    location and repository list as arguments
+  * jobs/miscellanea.txt.in - provide REPOSITORY and SOURCES_LIST environment
+    variables to the sources_test script (LP: #1149288)
+
  -- Brendan Donegan <[e-mail]>  Fri, 12 Apr 2013 17:48:54 +0100
 
 checkbox (0.15.7) raring; urgency=low
 
=== modified file 'jobs/miscellanea.txt.in'
--- jobs/miscellanea.txt.in	2013-04-12 15:57:54 +0000
+++ jobs/miscellanea.txt.in	2013-04-15 10:09:25 +0000
@@ -67,7 +67,7 @@
 
 plugin: shell
 name: miscellanea/sources-list
-command: sources_test
+command: sources_test $SOURCES_LIST "$REPOSITORIES"
 _description: Checks that a specified sources list file contains the requested repositories
 
 plugin: local
 
=== modified file 'scripts/sources_test'
--- scripts/sources_test	2013-03-07 10:46:20 +0000
+++ scripts/sources_test	2013-04-15 10:09:25 +0000
@@ -2,22 +2,25 @@
 
 result=0
 
-if [ -z "$SOURCES_LIST" ]; then
-    echo "See https://wiki.ubuntu.com/Testing/Automation/Checkbox/ConfiguringSourcesListTest for how to provide sources list location."
+sources_list=$1
+repositories=$2
+
+if [ -z "$sources_list" ]; then
+    echo "Must provide sources list location, e.g. /etc/apt/sources.list"
     exit 1
 fi
 
-if [ -z "$REPOSITORIES" ]; then
-    echo "See https://wiki.ubuntu.com/Testing/Automation/Checkbox/ConfiguringSourcesListTest for how to provide list of repositories to check for."
+if [ -z "$repositories" ]; then
+    echo "Must provide list of repositories to check for, e.g. 'deb http://gb.archive.ubuntu.com/ubuntu/ precise multiverse, deb http://gb.archive.ubuntu.com/ubuntu/ precise-updates multiverse'"
     exit 1
 fi
 
 IFS=$','
-for repository in $REPOSITORIES; do
-    if grep -q "$repository" "$SOURCES_LIST"; then
-        echo "$repository found in $SOURCES_LIST"
+for repository in $repositories; do
+    if grep -q "$repository" "$sources_list"; then
+        echo "$repository found in $sources_list"
     else
-        echo "$repository not found in $SOURCES_LIST"
+        echo "$repository not found in $sources_list"
         result=1
     fi
 done