[Python-modules-commits] r29595 - in packages/django-simple-captcha/trunk/debian (6 files)

[bam at users.alioth.debian.org]

    Date: Thursday, July 3, 2014 @ 01:58:11
  Author: bam
Revision: 29595

Simplify the tests.

Added:
  packages/django-simple-captcha/trunk/debian/clean
  packages/django-simple-captcha/trunk/debian/run_tests.py
Modified:
  packages/django-simple-captcha/trunk/debian/changelog
  packages/django-simple-captcha/trunk/debian/patches/series
  packages/django-simple-captcha/trunk/debian/rules
Deleted:
  packages/django-simple-captcha/trunk/debian/patches/tests

Modified: packages/django-simple-captcha/trunk/debian/changelog
===================================================================
--- packages/django-simple-captcha/trunk/debian/changelog	2014-07-03 01:18:15 UTC (rev 29594)
+++ packages/django-simple-captcha/trunk/debian/changelog	2014-07-03 01:58:11 UTC (rev 29595)
@@ -1,3 +1,10 @@
+django-simple-captcha (0.4.2-5) UNRELEASED; urgency=low
+
+  * Simplify how we call the tests in debian/rules.
+  * NOT RELEASED YET
+
+ -- Brian May <bam at debian.org>  Wed, 02 Jul 2014 16:01:35 +1000
+
 django-simple-captcha (0.4.2-4) unstable; urgency=low
 
   * Python3 package.

Added: packages/django-simple-captcha/trunk/debian/clean
===================================================================
--- packages/django-simple-captcha/trunk/debian/clean	                        (rev 0)
+++ packages/django-simple-captcha/trunk/debian/clean	2014-07-03 01:58:11 UTC (rev 29595)
@@ -0,0 +1 @@
+tests.db

Modified: packages/django-simple-captcha/trunk/debian/patches/series
===================================================================
--- packages/django-simple-captcha/trunk/debian/patches/series	2014-07-03 01:18:15 UTC (rev 29594)
+++ packages/django-simple-captcha/trunk/debian/patches/series	2014-07-03 01:58:11 UTC (rev 29595)
@@ -1,3 +1,2 @@
-tests
 depends
 pillow

Deleted: packages/django-simple-captcha/trunk/debian/patches/tests
===================================================================
--- packages/django-simple-captcha/trunk/debian/patches/tests	2014-07-03 01:18:15 UTC (rev 29594)
+++ packages/django-simple-captcha/trunk/debian/patches/tests	2014-07-03 01:58:11 UTC (rev 29595)
@@ -1,18 +0,0 @@
-Index: django-simple-captcha-0.4.2/captcha/tests/settings.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ django-simple-captcha-0.4.2/captcha/tests/settings.py	2014-07-02 15:05:33.479117584 +1000
-@@ -0,0 +1,13 @@
-+INSTALLED_APPS=[ "captcha", ]
-+SECRET_KEY = '5hvhpe6gv2t5x4$3dtq(w2v#vg@)sx4p3r_ at wv%l41g!stslc*'
-+ROOT_URLCONF = None
-+DATABASES = {
-+    'default': {
-+        'ENGINE': 'django.db.backends.sqlite3',
-+        'NAME': 'captcha.db',
-+        'USER': '',
-+        'PASSWORD': '',
-+        'HOST': '',
-+        'PORT': '',
-+    }
-+}

Modified: packages/django-simple-captcha/trunk/debian/rules
===================================================================
--- packages/django-simple-captcha/trunk/debian/rules	2014-07-03 01:18:15 UTC (rev 29594)
+++ packages/django-simple-captcha/trunk/debian/rules	2014-07-03 01:58:11 UTC (rev 29595)
@@ -6,12 +6,8 @@
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-export PYTHONPATH=$(CURDIR)
-
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
-	python2.7 /usr/lib/python2.7/dist-packages/django/bin/django-admin.py \
-		test --settings=captcha.tests.settings
-	python3 /usr/lib/python3/dist-packages/django/bin/django-admin.py \
-		test --settings=captcha.tests.settings
+	python2 debian/run_tests.py
+	python3 debian/run_tests.py
 

Added: packages/django-simple-captcha/trunk/debian/run_tests.py
===================================================================
--- packages/django-simple-captcha/trunk/debian/run_tests.py	                        (rev 0)
+++ packages/django-simple-captcha/trunk/debian/run_tests.py	2014-07-03 01:58:11 UTC (rev 29595)
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import os
+import sys
+sys.path.insert(0, os.getcwd())
+
+from django.conf import settings
+settings.configure(
+    ROOT_URLCONF=None,
+    INSTALLED_APPS=['captcha'],
+    DATABASES={
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': 'tests.db',
+            'USER': '',
+            'PASSWORD': '',
+            'HOST': '',
+            'PORT': '',
+        }
+    }
+)
+
+from django.core import management
+management.call_command('test')