[Python-modules-commits] r28053 - in packages/fedmsg/trunk/debian (5 files)

[olasd at users.alioth.debian.org]

    Date: Saturday, March 8, 2014 @ 14:48:53
  Author: olasd
Revision: 28053

Readd test_certs patch and fix d/rules so that tests run correctly

Added:
  packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff
Modified:
  packages/fedmsg/trunk/debian/clean
  packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
  packages/fedmsg/trunk/debian/patches/series
  packages/fedmsg/trunk/debian/rules

Modified: packages/fedmsg/trunk/debian/clean
===================================================================
--- packages/fedmsg/trunk/debian/clean	2014-03-08 13:53:08 UTC (rev 28052)
+++ packages/fedmsg/trunk/debian/clean	2014-03-08 14:48:53 UTC (rev 28053)
@@ -1 +1,2 @@
 fedmsg.egg-info/*
+fedmsg/tests/test_certs/gpg/random_seed

Modified: packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
===================================================================
--- packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2014-03-08 13:53:08 UTC (rev 28052)
+++ packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2014-03-08 14:48:53 UTC (rev 28053)
@@ -1,13 +1,14 @@
 Index: fedmsg-0.7.6/fedmsg/doc_utilities.py
 ===================================================================
 --- fedmsg-0.7.6.orig/fedmsg/doc_utilities.py	2013-11-13 23:20:03.000000000 +0100
-+++ fedmsg-0.7.6/fedmsg/doc_utilities.py	2014-03-08 14:49:53.731080218 +0100
-@@ -101,8 +101,8 @@
++++ fedmsg-0.7.6/fedmsg/doc_utilities.py	2014-03-08 15:10:25.263916431 +0100
+@@ -101,8 +101,9 @@
      fname = output_dir + "/topics.rst"
  
      global outfile
 -    import fedmsg_meta_fedora_infrastructure
 -    filename = fedmsg_meta_fedora_infrastructure.__file__
++    return
 +    import fedmsg_meta_debian
 +    filename = fedmsg_meta_debian.__file__
      folder = os.path.sep + os.path.join(*filename.split('/')[:-1])

Added: packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff	                        (rev 0)
+++ packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff	2014-03-08 14:48:53 UTC (rev 28053)
@@ -0,0 +1,11 @@
+--- fedmsg-0.7.6.orig/fedmsg/tests/fedmsg-test-config.py
++++ fedmsg-0.7.6/fedmsg/tests/fedmsg-test-config.py
+@@ -23,7 +23,7 @@ import socket
+ import random
+ 
+ SEP = os.path.sep
+-here = os.getcwd()
++here = SEP.join([os.getcwd(), "fedmsg/tests"])
+ hostname = socket.gethostname().split('.', 1)[0]
+ 
+ ssl_enabled_for_tests = True

Modified: packages/fedmsg/trunk/debian/patches/series
===================================================================
--- packages/fedmsg/trunk/debian/patches/series	2014-03-08 13:53:08 UTC (rev 28052)
+++ packages/fedmsg/trunk/debian/patches/series	2014-03-08 14:48:53 UTC (rev 28053)
@@ -2,3 +2,4 @@
 no-tweet
 remove_reference_to_google_web_fonts.diff
 bypass_fedmsg_meta_fedora_infrastructure.patch
+fix_test_certs_path.diff

Modified: packages/fedmsg/trunk/debian/rules
===================================================================
--- packages/fedmsg/trunk/debian/rules	2014-03-08 13:53:08 UTC (rev 28052)
+++ packages/fedmsg/trunk/debian/rules	2014-03-08 14:48:53 UTC (rev 28053)
@@ -32,6 +32,7 @@
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/_build/
+	rm -rf fedmsg/tests/fedmsg.d/
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGELOG.rst
@@ -39,6 +40,7 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
+	cp -r fedmsg.d fedmsg/tests/; \
 	for py in $(shell pyversions -r); do \
 	 	$$py setup.py test ; \
 	done