From bc1006f3e0510d9c383bbf6ac02052eb7936fba4 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 9 May 2019 14:37:18 +0200 Subject: Bump to v0.48.0rc1 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 43459b6..d268665 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.48.0.dev0 +current_version = 0.48.0rc1 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index e1b25f3..1f5070b 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.48.0.dev0", + version="0.48.0rc1", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From 9ce58eee91cff07ea6ad396eec7dd38727b30fdf Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Tue, 21 May 2019 17:41:53 +0200 Subject: bin:gst_pipeline_test: Use pactl instead of pacmd --- bin/gst_pipeline_test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/gst_pipeline_test b/bin/gst_pipeline_test index 4d9f3c4..f6b6703 100755 --- a/bin/gst_pipeline_test +++ b/bin/gst_pipeline_test @@ -17,14 +17,14 @@ from subprocess import check_output def check_state(device): """Checks whether the sink is available for the given device. """ - sink_info = check_output(['pacmd', 'list-sinks'], + sink_info = check_output(['pactl', 'list', 'sinks'], universal_newlines=True) data = sink_info.split("\n") try: - device_name = re.findall(".*name:\s.*%s.*" % device, sink_info)[0].lstrip() - sink = re.findall(".*name:\s<(.*%s.*)>" % device, sink_info)[0].lstrip() - status = data[data.index("\t" + device_name) + 3] + device_name = re.findall(".*Name:\s.*%s.*" % device, sink_info)[0].lstrip() + sink = re.findall(".*Name:\s(.*%s.*)" % device, sink_info)[0].lstrip() + status = data[data.index("\t" + device_name) - 1] except (IndexError, ValueError): logging.error("Failed to find status for device: %s" % device) return False -- cgit v1.2.3 From e8635818ca7a08225d7ef4740697e99658970268 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 23 May 2019 17:42:14 +0200 Subject: Bump to v0.48.0rc2 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d268665..aed5e18 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.48.0rc1 +current_version = 0.48.0rc2 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index 1f5070b..f00a334 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.48.0rc1", + version="0.48.0rc2", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From d308ba18a30b35c0e563300f7371b7f89c4ad85a Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Mon, 27 May 2019 14:52:02 +0200 Subject: bin:removable_storage_test: Ensure it is a media card reader only if this was explicitly requested Fixes: lp:1811645 --- bin/removable_storage_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bin/removable_storage_test b/bin/removable_storage_test index a7abdfe..249911a 100755 --- a/bin/removable_storage_test +++ b/bin/removable_storage_test @@ -391,12 +391,11 @@ class DiskTest(): interconnect_speed * 10 ** 6) else: self.rem_disks_speed[dev_file] = None - # We need to skip-non memory cards if we look for memory cards and - # vice-versa so let's inspect the drive and use heuristics to - # detect memory cards (a memory card reader actually) now. - if self.memorycard != is_memory_card(drive_props['Vendor'], - drive_props['Model'], - drive_props['Media']): + # Ensure it is a media card reader if this was explicitly requested + drive_is_reader = is_memory_card( + drive_props['Vendor'], drive_props['Model'], + drive_props['Media']) + if self.memorycard and not drive_is_reader: continue # The if/else test below simply distributes the mount_point to the # appropriate variable, to keep the API requirements. It is -- cgit v1.2.3 From 6ffcf9af0529db903d456eda71fe134bb6afdd55 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Mon, 27 May 2019 15:15:54 +0200 Subject: Bump to v0.48.0rc3 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index aed5e18..4690a4a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.48.0rc2 +current_version = 0.48.0rc3 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index f00a334..c6891b1 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.48.0rc2", + version="0.48.0rc3", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From e36b3bba4da911af535a318b7e58e9682827b2df Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Mon, 3 Jun 2019 11:55:40 +0200 Subject: Bump to v0.48.0 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4690a4a..fec2e67 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.48.0rc3 +current_version = 0.48.0 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index c6891b1..d287c9c 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.48.0rc3", + version="0.48.0", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From 4d41a51da0f227cb892edbd5fdb81c25a54bdb89 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Mon, 3 Jun 2019 11:55:41 +0200 Subject: increment version to v0.49.0.dev0 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fec2e67..da97b15 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.48.0 +current_version = 0.49.0.dev0 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index d287c9c..45e32f8 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ from plainbox.provider_manager import N_ setup( name='plainbox-provider-checkbox', namespace='com.canonical.certification', - version="0.48.0", + version="0.49.0.dev0", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3