Ubuntu Pastebin

Paste from martin at Fri, 14 Aug 2015 09:13:44 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
diff -Nru bluez-5.33/debian/changelog bluez-5.33/debian/changelog
--- bluez-5.33/debian/changelog	2015-08-12 15:28:11.000000000 +0200
+++ bluez-5.33/debian/changelog	2015-08-14 11:13:09.000000000 +0200
@@ -1,3 +1,17 @@
+bluez (5.33-0ubuntu2) wily; urgency=medium
+
+  * debian/tests/bluez_response:
+    - Stop setting up private D-BUS. An autopkgtest must test what's
+      installed, including the real system bus.
+    - Stop calling bluetoothd (which hangs in 5.x, as it doesn't fork), and
+      just call "service bluetooth start" to actually test our packaged
+      startup scripts.
+  * debian/tests/control: Drop unused Python 2 dependencies.
+  * debian/tests/control: Add "isolation-container", this shouldn't be
+    attempted in a schroot.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 14 Aug 2015 11:10:42 +0200
+
 bluez (5.33-0ubuntu1) wily; urgency=medium
 
   * New upstream version, drop patch included in the update
diff -Nru bluez-5.33/debian/tests/bluez_response bluez-5.33/debian/tests/bluez_response
--- bluez-5.33/debian/tests/bluez_response	2014-11-17 19:23:45.000000000 +0100
+++ bluez-5.33/debian/tests/bluez_response	2015-08-14 11:07:02.000000000 +0200
@@ -11,15 +11,8 @@
   devices = {}
 
   def setUp(self):
-    # start a local fake system D-BUS
-    dbus = subprocess.Popen(['dbus-daemon', '--nofork', '--print-address',
-                            '--config-file',
-                            os.path.join(aptdaemon.test.get_tests_dir(), 'dbus.conf')],
-                            stdout=subprocess.PIPE, universal_newlines=True)
-    dbus_address = dbus.stdout.readline().strip()
-    os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = dbus_address
-
-    subprocess.call(['bluetoothd'])
+    # bluetoothd starts on demand, so make sure it's running
+    subprocess.call(['service', 'bluetooth', 'start'])
     p1 = subprocess.Popen(['hciconfig'],
                           stdout=subprocess.PIPE,
                           universal_newlines=True)
diff -Nru bluez-5.33/debian/tests/control bluez-5.33/debian/tests/control
--- bluez-5.33/debian/tests/control	2014-11-17 19:23:45.000000000 +0100
+++ bluez-5.33/debian/tests/control	2015-08-14 11:12:48.000000000 +0200
@@ -1,3 +1,3 @@
 Tests: bluez_response
-Depends: python3-aptdaemon.test, python, python3, python-gi, python3-gi, python-dbus, python3-dbus, gir1.2-glib-2.0, bluez, bluez-test-scripts
-Restrictions: needs-root
+Depends: python3-aptdaemon.test, python3, python3-gi, python3-dbus, gir1.2-glib-2.0, bluez, bluez-test-scripts
+Restrictions: needs-root, isolation-container
Download as text