[GNUnet-SVN] r25103 - gnunet-update/src/tests

[gnunet]

Author: harsha
Date: 2012-11-22 16:27:15 +0100 (Thu, 22 Nov 2012)
New Revision: 25103

Added:
   gnunet-update/src/tests/gen_user_home.sh.in
Removed:
   gnunet-update/src/tests/gen_user_home.sh
Modified:
   gnunet-update/src/tests/Makefile.am
   gnunet-update/src/tests/test_group.py
Log:
- fixes

Modified: gnunet-update/src/tests/Makefile.am
===================================================================
--- gnunet-update/src/tests/Makefile.am 2012-11-22 15:15:20 UTC (rev 25102)
+++ gnunet-update/src/tests/Makefile.am 2012-11-22 15:27:15 UTC (rev 25103)
@@ -1,8 +1,17 @@
-check_DATA = gen_user_home
+do_subst = sed -e 's,address@hidden@],$(pkgpythondir),g' \
+       -e 's,address@hidden@],$(prefix),g' \
+       -e 's,address@hidden@],$(srcdir),g'
 
-gen_user_home: gen_user_home.sh
-       $(srcdir)/gen_user_home.sh
+check_DATA = \
+  gen_user_home
 
+homedir = user-home
+
+gen_user_home: gen_user_home.sh.in Makefile
+       $(do_subst) < $(srcdir)/gen_user_home.sh.in > gen_user_home.sh
+       chmod +x gen_user_home.sh
+       ./gen_user_home.sh
+
 TESTS_ENVIRONMENT = $(PYTHON)
 testscripts = \
   test_config.py \
@@ -74,7 +83,7 @@
 
 EXTRA_DIST = \
   __init__.py \
-  gen_user_home.sh \
+  gen_user_home.sh.in \
   keys \
   confs \
   $(testscripts) \

Deleted: gnunet-update/src/tests/gen_user_home.sh
===================================================================
--- gnunet-update/src/tests/gen_user_home.sh    2012-11-22 15:15:20 UTC (rev 
25102)
+++ gnunet-update/src/tests/gen_user_home.sh    2012-11-22 15:27:15 UTC (rev 
25103)
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# File: tests/gen_user_home.sh
-# Author: Sree Harsha Totakura
-# File to generate a directory for test cases. This directory is similar to a
-# user's home directory
-
-homedir="user-home"
-
-# Clean up existing directory
-rm -rf $homedir
-
-mkdir -p "$homedir/.gnunet-update"
-HOME=$homedir
-gpg --import keys/test.sec \
-    && cp confs/gnunet-update.conf "$homedir/.gnunet-update" \
-    && echo 0 > "$homedir/.gnunet-update/release-counter"

Copied: gnunet-update/src/tests/gen_user_home.sh.in (from rev 25101, 
gnunet-update/src/tests/gen_user_home.sh)
===================================================================
--- gnunet-update/src/tests/gen_user_home.sh.in                         (rev 0)
+++ gnunet-update/src/tests/gen_user_home.sh.in 2012-11-22 15:27:15 UTC (rev 
25103)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# File: tests/gen_user_home.sh
+# Author: Sree Harsha Totakura
+# File to generate a directory for test cases. This directory is similar to a
+# user's home directory. This file is automatically generated from 
tests/gen_user_home.sh.in
+
+homedir="user-home"
+
+# Clean up existing directory
+rm -rf $homedir
+
+mkdir -p "$homedir/.gnunet-update"
+HOME=$homedir
+gpg --import @srcdir@/keys/test.sec \
+    && cp @srcdir@/confs/gnunet-update.conf "$homedir/.gnunet-update" \
+    && echo 0 > "$homedir/.gnunet-update/release-counter"

Modified: gnunet-update/src/tests/test_group.py
===================================================================
--- gnunet-update/src/tests/test_group.py       2012-11-22 15:15:20 UTC (rev 
25102)
+++ gnunet-update/src/tests/test_group.py       2012-11-22 15:27:15 UTC (rev 
25103)
@@ -38,8 +38,9 @@
                       ["*/test-package/*.am"])
         matched_files = group.match("." if pwd=='' else pwd)
         self.assertEqual(len(matched_files), 2)
-        self.assertEqual(matched_files, ["old/test-package/Makefile.am",
-                                         "new/test-package/Makefile.am"])
+        self.assertEqual(sorted(matched_files),
+                         sorted(["old/test-package/Makefile.am",
+                                 "new/test-package/Makefile.am"]))
 
 if __name__=='__main__':
     unittest.main()