Diff of the two buildlogs:

--
--- b1/build.log	2021-12-11 11:27:15.326841289 +0000
+++ b2/build.log	2021-12-11 11:33:09.811775033 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri Jan 13 05:49:00 -12 2023
-I: pbuilder-time-stamp: 1673632140
+I: Current time: Sun Dec 12 01:27:17 +14 2021
+I: pbuilder-time-stamp: 1639222037
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -17,7 +17,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Tue Sep  4 01:41:14 2018 -12
+gpgv: Signature made Wed Sep  5 03:41:14 2018 +14
 gpgv:                using RSA key B4A0AAFCA86C86055D067614AB53E503586877A6
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./python-os-service-types_1.3.0-2.dsc
@@ -28,136 +28,170 @@
 dpkg-source: info: applying missing-files.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2769122/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos1-amd64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash'
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='amd64'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=16'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='amd64'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu")
+  BASH_VERSION='5.0.3(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=amd64
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=15'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=x86_64
+  HOST_ARCH=amd64
   IFS=' 	
   '
-  INVOCATION_ID='fd1054dd46dc48fe988dfe238b895ef1'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='2769122'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=3fa70c65826b45d2bda3ad20928ab3b2
+  LANG=C
+  LANGUAGE=et_EE:et
+  LC_ALL=C
+  MACHTYPE=x86_64-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=3116192
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.JYfiuobNMI/pbuilderrc_HN7F --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.JYfiuobNMI/b1 --logfile b1/build.log python-os-service-types_1.3.0-2.dsc'
-  SUDO_GID='111'
-  SUDO_UID='106'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://85.184.249.68:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.JYfiuobNMI/pbuilderrc_Nr1N --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.JYfiuobNMI/b2 --logfile b2/build.log python-os-service-types_1.3.0-2.dsc'
+  SUDO_GID=110
+  SUDO_UID=105
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://78.137.99.97:3128
 I: uname -a
-  Linux ionos15-amd64 5.14.0-0.bpo.2-amd64 #1 SMP Debian 5.14.9-2~bpo11+1 (2021-10-10) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-9-amd64 #1 SMP Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux
 I: ls -l /bin
   total 5116
-  -rwxr-xr-x 1 root root 1168776 Apr 17  2019 bash
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bunzip2
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bzcat
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root    2227 Jul 10  2019 bzdiff
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root    4877 Jun 24  2019 bzexe
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root    3641 Jul 10  2019 bzgrep
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bzip2
-  -rwxr-xr-x 1 root root   14328 Jul 10  2019 bzip2recover
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzless -> bzmore
-  -rwxr-xr-x 1 root root    1297 Jul 10  2019 bzmore
-  -rwxr-xr-x 1 root root   43744 Feb 28  2019 cat
-  -rwxr-xr-x 1 root root   64320 Feb 28  2019 chgrp
-  -rwxr-xr-x 1 root root   64288 Feb 28  2019 chmod
-  -rwxr-xr-x 1 root root   72512 Feb 28  2019 chown
-  -rwxr-xr-x 1 root root  146880 Feb 28  2019 cp
-  -rwxr-xr-x 1 root root  121464 Jan 17  2019 dash
-  -rwxr-xr-x 1 root root  109408 Feb 28  2019 date
-  -rwxr-xr-x 1 root root   76712 Feb 28  2019 dd
-  -rwxr-xr-x 1 root root   93744 Feb 28  2019 df
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 dir
-  -rwxr-xr-x 1 root root   84288 Jan  9  2019 dmesg
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 domainname -> hostname
-  -rwxr-xr-x 1 root root   39520 Feb 28  2019 echo
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 egrep
-  -rwxr-xr-x 1 root root   35424 Feb 28  2019 false
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 fgrep
-  -rwxr-xr-x 1 root root   68880 Jan  9  2019 findmnt
-  -rwsr-xr-x 1 root root   34896 Apr 22  2020 fusermount
-  -rwxr-xr-x 1 root root  198976 Jan  7  2019 grep
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 gunzip
-  -rwxr-xr-x 1 root root    6375 Jan  5  2019 gzexe
-  -rwxr-xr-x 1 root root   98048 Jan  5  2019 gzip
-  -rwxr-xr-x 1 root root   26696 Sep 26  2018 hostname
-  -rwxr-xr-x 1 root root   68552 Feb 28  2019 ln
-  -rwxr-xr-x 1 root root   56760 Jul 26  2018 login
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 ls
-  -rwxr-xr-x 1 root root  108624 Jan  9  2019 lsblk
-  -rwxr-xr-x 1 root root   89088 Feb 28  2019 mkdir
-  -rwxr-xr-x 1 root root   68544 Feb 28  2019 mknod
-  -rwxr-xr-x 1 root root   43808 Feb 28  2019 mktemp
-  -rwxr-xr-x 1 root root   43008 Jan  9  2019 more
-  -rwsr-xr-x 1 root root   51280 Jan  9  2019 mount
-  -rwxr-xr-x 1 root root   14408 Jan  9  2019 mountpoint
-  -rwxr-xr-x 1 root root  138728 Feb 28  2019 mv
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root      14 Feb 14  2019 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root   39616 Feb 28  2019 pwd
-  lrwxrwxrwx 1 root root       4 Apr 17  2019 rbash -> bash
-  -rwxr-xr-x 1 root root   47776 Feb 28  2019 readlink
-  -rwxr-xr-x 1 root root   68416 Feb 28  2019 rm
-  -rwxr-xr-x 1 root root   47776 Feb 28  2019 rmdir
-  -rwxr-xr-x 1 root root   23312 Jan 21  2019 run-parts
-  -rwxr-xr-x 1 root root  122224 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root       4 Dec 10 16:20 sh -> dash
-  -rwxr-xr-x 1 root root   39552 Feb 28  2019 sleep
-  -rwxr-xr-x 1 root root   80672 Feb 28  2019 stty
-  -rwsr-xr-x 1 root root   63568 Jan  9  2019 su
-  -rwxr-xr-x 1 root root   35488 Feb 28  2019 sync
-  -rwxr-xr-x 1 root root  445560 Apr 23  2019 tar
-  -rwxr-xr-x 1 root root   14440 Jan 21  2019 tempfile
-  -rwxr-xr-x 1 root root   97152 Feb 28  2019 touch
-  -rwxr-xr-x 1 root root   35424 Feb 28  2019 true
-  -rwxr-xr-x 1 root root   14328 Apr 22  2020 ulockmgr_server
-  -rwsr-xr-x 1 root root   34888 Jan  9  2019 umount
-  -rwxr-xr-x 1 root root   39584 Feb 28  2019 uname
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 uncompress
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 vdir
-  -rwxr-xr-x 1 root root   34896 Jan  9  2019 wdctl
-  -rwxr-xr-x 1 root root     946 Jan 21  2019 which
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root    1983 Jan  5  2019 zcat
-  -rwxr-xr-x 1 root root    1677 Jan  5  2019 zcmp
-  -rwxr-xr-x 1 root root    5879 Jan  5  2019 zdiff
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zegrep
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zfgrep
-  -rwxr-xr-x 1 root root    2080 Jan  5  2019 zforce
-  -rwxr-xr-x 1 root root    7584 Jan  5  2019 zgrep
-  -rwxr-xr-x 1 root root    2205 Jan  5  2019 zless
-  -rwxr-xr-x 1 root root    1841 Jan  5  2019 zmore
-  -rwxr-xr-x 1 root root    4552 Jan  5  2019 znew
-I: user script /srv/workspace/pbuilder/2769122/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 1168776 Apr 18  2019 bash
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bunzip2
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bzcat
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root    2227 Jul 11  2019 bzdiff
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root    4877 Jun 25  2019 bzexe
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root    3641 Jul 11  2019 bzgrep
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bzip2
+  -rwxr-xr-x 1 root root   14328 Jul 11  2019 bzip2recover
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzless -> bzmore
+  -rwxr-xr-x 1 root root    1297 Jul 11  2019 bzmore
+  -rwxr-xr-x 1 root root   43744 Mar  1  2019 cat
+  -rwxr-xr-x 1 root root   64320 Mar  1  2019 chgrp
+  -rwxr-xr-x 1 root root   64288 Mar  1  2019 chmod
+  -rwxr-xr-x 1 root root   72512 Mar  1  2019 chown
+  -rwxr-xr-x 1 root root  146880 Mar  1  2019 cp
+  -rwxr-xr-x 1 root root  121464 Jan 18  2019 dash
+  -rwxr-xr-x 1 root root  109408 Mar  1  2019 date
+  -rwxr-xr-x 1 root root   76712 Mar  1  2019 dd
+  -rwxr-xr-x 1 root root   93744 Mar  1  2019 df
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 dir
+  -rwxr-xr-x 1 root root   84288 Jan 10  2019 dmesg
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 domainname -> hostname
+  -rwxr-xr-x 1 root root   39520 Mar  1  2019 echo
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 egrep
+  -rwxr-xr-x 1 root root   35424 Mar  1  2019 false
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 fgrep
+  -rwxr-xr-x 1 root root   68880 Jan 10  2019 findmnt
+  -rwsr-xr-x 1 root root   34896 Apr 23  2020 fusermount
+  -rwxr-xr-x 1 root root  198976 Jan  8  2019 grep
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 gunzip
+  -rwxr-xr-x 1 root root    6375 Jan  6  2019 gzexe
+  -rwxr-xr-x 1 root root   98048 Jan  6  2019 gzip
+  -rwxr-xr-x 1 root root   26696 Sep 27  2018 hostname
+  -rwxr-xr-x 1 root root   68552 Mar  1  2019 ln
+  -rwxr-xr-x 1 root root   56760 Jul 27  2018 login
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 ls
+  -rwxr-xr-x 1 root root  108624 Jan 10  2019 lsblk
+  -rwxr-xr-x 1 root root   89088 Mar  1  2019 mkdir
+  -rwxr-xr-x 1 root root   68544 Mar  1  2019 mknod
+  -rwxr-xr-x 1 root root   43808 Mar  1  2019 mktemp
+  -rwxr-xr-x 1 root root   43008 Jan 10  2019 more
+  -rwsr-xr-x 1 root root   51280 Jan 10  2019 mount
+  -rwxr-xr-x 1 root root   14408 Jan 10  2019 mountpoint
+  -rwxr-xr-x 1 root root  138728 Mar  1  2019 mv
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root      14 Feb 15  2019 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root   39616 Mar  1  2019 pwd
+  lrwxrwxrwx 1 root root       4 Apr 18  2019 rbash -> bash
+  -rwxr-xr-x 1 root root   47776 Mar  1  2019 readlink
+  -rwxr-xr-x 1 root root   68416 Mar  1  2019 rm
+  -rwxr-xr-x 1 root root   47776 Mar  1  2019 rmdir
+  -rwxr-xr-x 1 root root   23312 Jan 22  2019 run-parts
+  -rwxr-xr-x 1 root root  122224 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root       4 Dec 12 01:27 sh -> bash
+  lrwxrwxrwx 1 root root       4 Nov  8 11:58 sh.distrib -> dash
+  -rwxr-xr-x 1 root root   39552 Mar  1  2019 sleep
+  -rwxr-xr-x 1 root root   80672 Mar  1  2019 stty
+  -rwsr-xr-x 1 root root   63568 Jan 10  2019 su
+  -rwxr-xr-x 1 root root   35488 Mar  1  2019 sync
+  -rwxr-xr-x 1 root root  445560 Apr 24  2019 tar
+  -rwxr-xr-x 1 root root   14440 Jan 22  2019 tempfile
+  -rwxr-xr-x 1 root root   97152 Mar  1  2019 touch
+  -rwxr-xr-x 1 root root   35424 Mar  1  2019 true
+  -rwxr-xr-x 1 root root   14328 Apr 23  2020 ulockmgr_server
+  -rwsr-xr-x 1 root root   34888 Jan 10  2019 umount
+  -rwxr-xr-x 1 root root   39584 Mar  1  2019 uname
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 uncompress
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 vdir
+  -rwxr-xr-x 1 root root   34896 Jan 10  2019 wdctl
+  -rwxr-xr-x 1 root root     946 Jan 22  2019 which
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root    1983 Jan  6  2019 zcat
+  -rwxr-xr-x 1 root root    1677 Jan  6  2019 zcmp
+  -rwxr-xr-x 1 root root    5879 Jan  6  2019 zdiff
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zegrep
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zfgrep
+  -rwxr-xr-x 1 root root    2080 Jan  6  2019 zforce
+  -rwxr-xr-x 1 root root    7584 Jan  6  2019 zgrep
+  -rwxr-xr-x 1 root root    2205 Jan  6  2019 zless
+  -rwxr-xr-x 1 root root    1841 Jan  6  2019 zmore
+  -rwxr-xr-x 1 root root    4552 Jan  6  2019 znew
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -483,7 +517,7 @@
 Get: 242 http://deb.debian.org/debian buster/main amd64 python3-oslotest all 1:3.6.0-2 [19.2 kB]
 Get: 243 http://deb.debian.org/debian buster/main amd64 python3-requests-mock all 1.5.2-2 [14.5 kB]
 Get: 244 http://deb.debian.org/debian buster/main amd64 python3-testscenarios all 0.5.0-2 [13.4 kB]
-Fetched 55.0 MB in 1s (60.7 MB/s)
+Fetched 55.0 MB in 2s (24.6 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:amd64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19195 files and directories currently installed.)
@@ -1556,7 +1590,8 @@
 fakeroot is already the newest version (1.23-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/python-os-service-types-1.3.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../python-os-service-types_1.3.0-2_source.changes
+hostname: Name or service not known
+I: Running cd /build/python-os-service-types-1.3.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../python-os-service-types_1.3.0-2_source.changes
 dpkg-buildpackage: info: source package python-os-service-types
 dpkg-buildpackage: info: source version 1.3.0-2
 dpkg-buildpackage: info: source distribution unstable
@@ -1652,1036 +1687,1040 @@
 + PYTHONS=disabled
 + PYTHON3S=disabled
 + TEST_PARALLEL_OPT=--parallel
-+ [ yes = yes ]
++ '[' yes = yes ']'
 + PYTHONS=2.7
-+ [ yes = yes ]
-+ py3versions -vr
++ '[' yes = yes ']'
+++ py3versions -vr
 + PYTHON3S=3.7
-+ [ yes = no ]
-+ [ 2.7 = disabled ]
-+ echo 2.7
-+ cut -d. -f1
++ '[' yes = no ']'
++ for pyvers in ${PYTHONS} ${PYTHON3S}
++ '[' 2.7 = disabled ']'
+++ cut -d. -f1
+++ echo 2.7
 + PYMAJOR=2
-+ echo ===> Testing with python (python2)
++ echo '===> Testing with python (python2)'
 ===> Testing with python (python2)
-+ [ 2 = 3 ]
-+ [ 2 = 2 ]
-+ pwd
-+ [ -d /build/python-os-service-types-1.3.0/debian/tmp/usr/lib/python3/dist-packages ]
-+ [ -e .stestr.conf ]
++ '[' 2 = 3 ']'
++ '[' 2 = 2 ']'
+++ pwd
++ '[' -d /build/python-os-service-types-1.3.0/debian/tmp/usr/lib/python3/dist-packages ']'
++ '[' -e .stestr.conf ']'
 + rm -rf .stestr
-+ PYTHON=python2.7 python2-stestr run --subunit
++ PYTHON=python2.7
++ python2-stestr run --subunit
 + subunit2pyunit
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(network)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3) ... ok
 os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3)
 os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2)
-os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(network)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2)
+os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage)
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement) ... ok
 os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage)
 os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3)
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(missing)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(missing)
+os_service_types.tests.test_remote.TestRemote.test_is_official(missing) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block)
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_known(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(match-official)
+os_service_types.tests.test_match.TestMatch.test_is_match(match-official) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing) ... ok
+os_service_types.tests.test_misc.TestMisc.test_normalize_none
+os_service_types.tests.test_misc.TestMisc.test_normalize_none ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(compute)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage) ... ok
+os_service_types.tests.test_misc.TestMisc.test_normalize
+os_service_types.tests.test_misc.TestMisc.test_normalize ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(network)
+os_service_types.tests.test_remote.TestRemote.test_is_known(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage) ... ok
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(network)
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(missing)
-os_service_types.tests.test_remote.TestRemote.test_is_known(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_official(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(placement)
-os_service_types.tests.test_remote.TestRemote.test_is_official(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(missing)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3)
 os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(non-match)
+os_service_types.tests.test_match.TestMatch.test_is_match(non-match) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(network) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown)
+os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(network)
+os_service_types.tests.test_remote.TestRemote.test_is_official(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3)
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(network)
-os_service_types.tests.test_remote.TestRemote.test_is_known(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(network)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage) ... ok
-os_service_types.tests.test_misc.TestMisc.test_normalize_none
-os_service_types.tests.test_misc.TestMisc.test_normalize_none ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(missing)
-os_service_types.tests.test_remote.TestRemote.test_is_official(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2)
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2) ... ok
 os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3)
 os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2) ... ok
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_same
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_same ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(network)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(network) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(match-official)
-os_service_types.tests.test_match.TestMatch.test_is_match(match-official) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3)
 os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3) ... ok
 os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block)
 os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3)
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(placement)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias
-os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(placement)
-os_service_types.tests.test_remote.TestRemote.test_is_known(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(compute)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(network)
-os_service_types.tests.test_remote.TestRemote.test_is_official(network) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown)
-os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block)
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block) ... ok
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_different
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_different ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(network)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(placement)
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(network)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing)
 os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_remote_version(network)
 os_service_types.tests.test_remote.TestRemote.test_remote_version(network) ... ok
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement) ... ok
-os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official
-os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_misc.TestMisc.test_normalize
-os_service_types.tests.test_misc.TestMisc.test_normalize ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage)
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(missing)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(non-match)
-os_service_types.tests.test_match.TestMatch.test_is_match(non-match) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing)
 os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(placement)
+os_service_types.tests.test_remote.TestRemote.test_is_official(placement) ... ok
 os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage)
 os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage) ... ok
+os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias
+os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3) ... ok
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_different
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_different ... ok
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_same
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_same ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(placement)
+os_service_types.tests.test_remote.TestRemote.test_is_known(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(placement)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(missing)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
 os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage)
 os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_known(compute) ... ok
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(missing)
+os_service_types.tests.test_remote.TestRemote.test_is_known(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_official(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_remote_version(placement)
 os_service_types.tests.test_remote.TestRemote.test_remote_version(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2) ... ok
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage) ... ok
+os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official
+os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official ... ok
 
 ----------------------------------------------------------------------
-Ran 240 tests in 1.655s
+Ran 240 tests in 8.562s
 
 OK (skipped=6)
 + python2-stestr slowest
-Test id                                                                                           Runtime (s)
-------------------------------------------------------------------------------------------------  -----------
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute)                           0.018
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage)                0.018
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3)                          0.018
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage)                0.017
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2)                0.017
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute)           0.017
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2)                          0.016
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3)                     0.016
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)                              0.016
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement)  0.015
+Test id                                                                                             Runtime (s)
+--------------------------------------------------------------------------------------------------  -----------
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute)                           0.077
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute)                     0.067
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement)             0.061
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)  0.060
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network)        0.060
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2)       0.059
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement)          0.058
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)      0.058
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement)                      0.055
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)        0.055
 + rm -rf .stestr
-+ [ 3.7 = disabled ]
-+ echo 3.7
-+ cut -d. -f1
++ for pyvers in ${PYTHONS} ${PYTHON3S}
++ '[' 3.7 = disabled ']'
+++ echo 3.7
+++ cut -d. -f1
 + PYMAJOR=3
-+ echo ===> Testing with python (python3)
++ echo '===> Testing with python (python3)'
 ===> Testing with python (python3)
-+ [ 3 = 3 ]
-+ pwd
-+ [ -d /build/python-os-service-types-1.3.0/debian/tmp/usr/lib/python3/dist-packages ]
-+ [ -e .stestr.conf ]
++ '[' 3 = 3 ']'
+++ pwd
++ '[' -d /build/python-os-service-types-1.3.0/debian/tmp/usr/lib/python3/dist-packages ']'
++ '[' -e .stestr.conf ']'
 + rm -rf .stestr
-+ PYTHON=python3.7 python3-stestr run --subunit
++ PYTHON=python3.7
++ python3-stestr run --subunit
 + subunit2pyunit
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3)
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block-storage) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown)
-os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block)
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_aliases(network)
 os_service_types.tests.test_remote.TestRemote.test_get_aliases(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(missing)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block_storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(match-official)
+os_service_types.tests.test_match.TestMatch.test_is_match(match-official) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement)
 os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block)
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(non-match)
-os_service_types.tests.test_match.TestMatch.test_is_match(non-match) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(placement)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage) ... ok
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(missing) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network)
 os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(network)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage) ... ok
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_same
-os_service_types.tests.test_singleton.TestSingleton.test_singleton_same ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block)
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev3-finds-block) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3)
-os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network)
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(missing) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(compute) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing)
 os_service_types.tests.test_builtin.TestBuiltin.test_is_known(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2) ... ok
-os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias
-os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(network)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2)
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_known(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(network)
-os_service_types.tests.test_remote.TestRemote.test_is_known(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(network)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_official(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_is_known(missing)
 os_service_types.tests.test_remote.TestRemote.test_is_known(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(compute)
-os_service_types.tests.test_remote.TestRemote.test_is_official(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage) ... ok
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_official ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(missing) ... ok
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_same
+os_service_types.tests.test_singleton.TestSingleton.test_singleton_same ... ok
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias
+os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3)
+os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(network) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(placement) ... skipped u'Secondary services have no project mapping'
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(network)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(missing)
-os_service_types.tests.test_remote.TestRemote.test_is_official(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(network)
-os_service_types.tests.test_remote.TestRemote.test_is_official(network) ... ok
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias
-os_service_types.tests.test_warn.TestWarnOff.test_warning_not_emitted_on_alias ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev3) ... ok
-os_service_types.tests.test_misc.TestMisc.test_normalize
-os_service_types.tests.test_misc.TestMisc.test_normalize ... ok
-os_service_types.tests.test_misc.TestMisc.test_normalize_none
-os_service_types.tests.test_misc.TestMisc.test_normalize_none ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(volumev3) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev2) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2)
 os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_alias(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data(compute) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(missing) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block-storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3)
+os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-not-volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_official(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(network)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(placement) ... ok
 os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2)
 os_service_types.tests.test_match.TestMatch.test_is_match(block-finds-volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(network)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(network)
+os_service_types.tests.test_remote.TestRemote.test_is_known(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(compute)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_is_known(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev2) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_aliases(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_is_known(block_storage) ... ok
+os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias
+os_service_types.tests.test_warn.TestWarnOn.test_warning_emitted_on_alias ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(network) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(placement) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(missing)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(missing) ... ok
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage)
 os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(block-storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type(network) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_known(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev3) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(match-official)
-os_service_types.tests.test_match.TestMatch.test_is_match(match-official) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_aliases(compute) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_official_service_data(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block-storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_all_types(missing) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_project_name(block_storage) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(volumev3) ... ok
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage)
+os_service_types.tests.test_builtin.TestBuiltin.test_get_service_data_for_project(block-storage) ... ok
+os_service_types.tests.test_match.TestMatch.test_is_match(non-match)
+os_service_types.tests.test_match.TestMatch.test_is_match(non-match) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement)
 os_service_types.tests.test_remote.TestRemote.test_get_project_name(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(network)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(network) ... ok
+os_service_types.tests.test_misc.TestMisc.test_normalize_none
+os_service_types.tests.test_misc.TestMisc.test_normalize_none ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block_storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2)
 os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(compute)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing)
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown)
+os_service_types.tests.test_match.TestMatch.test_is_match(direct-match-unknown) ... ok
+os_service_types.tests.test_misc.TestMisc.test_normalize
+os_service_types.tests.test_misc.TestMisc.test_normalize ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(placement)
 os_service_types.tests.test_remote.TestRemote.test_get_all_types(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_project_name(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_get_aliases(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute)
 os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage)
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(placement)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(placement) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_alias(missing)
-os_service_types.tests.test_remote.TestRemote.test_is_alias(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(network)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(volumev3) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block-storage) ... ok
 os_service_types.tests.test_remote.TestRemote.test_is_known(placement)
 os_service_types.tests.test_remote.TestRemote.test_is_known(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(missing)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(network)
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_get_project_name(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network)
+os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(block-storage) ... ok
 os_service_types.tests.test_singleton.TestSingleton.test_singleton_different
 os_service_types.tests.test_singleton.TestSingleton.test_singleton_different ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_known(compute) ... ok
 os_service_types.tests.test_remote.TestRemote.test_is_official(placement)
 os_service_types.tests.test_remote.TestRemote.test_is_official(placement) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage)
-os_service_types.tests.test_builtin.TestBuiltin.test_all_get_service_data_for_project(block_storage) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_builtin_version(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute)
-os_service_types.tests.test_builtin.TestBuiltin.test_empty_project_error(compute) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3)
-os_service_types.tests.test_builtin.TestBuiltin.test_get_service_type_permissive(volumev3) ... ok
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2)
-os_service_types.tests.test_builtin.TestBuiltin.test_is_official(volumev2) ... ok
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block)
-os_service_types.tests.test_match.TestMatch.test_is_match(volumev2-finds-block) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute)
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(compute) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type(missing) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network)
-os_service_types.tests.test_remote.TestRemote.test_get_service_type_permissive(network) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage)
-os_service_types.tests.test_remote.TestRemote.test_is_known(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_type(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(block_storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(missing) ... skipped u'Empty project is invalid but tested elsewhere.'
+os_service_types.tests.test_remote.TestRemote.test_is_official(missing)
+os_service_types.tests.test_remote.TestRemote.test_is_official(missing) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(block-storage) ... ok
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement)
+os_service_types.tests.test_remote.TestRemote.test_get_service_data(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(compute)
+os_service_types.tests.test_remote.TestRemote.test_is_official(compute) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_alias(placement)
+os_service_types.tests.test_remote.TestRemote.test_is_alias(placement) ... ok
 os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2)
 os_service_types.tests.test_remote.TestRemote.test_is_official(volumev2) ... ok
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3)
-os_service_types.tests.test_remote.TestRemote.test_is_official(volumev3) ... ok
-os_service_types.tests.test_remote.TestRemote.test_remote_version(placement)
-os_service_types.tests.test_remote.TestRemote.test_remote_version(placement) ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_is_known(volumev3) ... ok
 os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official
 os_service_types.tests.test_warn.TestWarnOn.test_warning_not_emitted_on_official ... ok
+os_service_types.tests.test_remote.TestRemote.test_is_official(network)
+os_service_types.tests.test_remote.TestRemote.test_is_official(network) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev2) ... ok
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3)
+os_service_types.tests.test_remote.TestRemote.test_remote_version(volumev3) ... ok
 
 ----------------------------------------------------------------------
-Ran 240 tests in 1.610s
+Ran 240 tests in 6.529s
 
 OK (skipped=6)
 + python3-stestr slowest
 Test id                                                                                             Runtime (s)
 --------------------------------------------------------------------------------------------------  -----------
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)       0.018
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(compute)        0.017
-os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(compute)            0.016
-os_service_types.tests.test_remote.TestRemote.test_is_alias(compute)                                0.016
-os_service_types.tests.test_remote.TestRemote.test_is_known(compute)                                0.016
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(missing)                           0.015
-os_service_types.tests.test_remote.TestRemote.test_get_official_service_data(network)               0.015
-os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block_storage)  0.015
-os_service_types.tests.test_remote.TestRemote.test_is_official(block-storage)                       0.015
-os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)                     0.015
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(network)                     0.063
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev3)       0.063
+os_service_types.tests.test_remote.TestRemote.test_get_service_data_for_project(block-storage)      0.060
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(block_storage)               0.060
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(block-storage)  0.059
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(placement)      0.059
+os_service_types.tests.test_remote.TestRemote.test_empty_project_error(volumev3)                    0.058
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(missing)        0.057
+os_service_types.tests.test_remote.TestRemote.test_all_get_service_data_for_project(volumev2)       0.055
+os_service_types.tests.test_remote.TestRemote.test_get_all_types(block-storage)                     0.052
 + rm -rf .stestr
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
    create-stamp debian/debhelper-build-stamp
@@ -2700,23 +2739,24 @@
 pkgos-dh_auto_install
 + PKGOS_USE_PY2=yes
 + PKGOS_USE_PY3=yes
-+ dpkg-parsechangelog -SSource
+++ dpkg-parsechangelog -SSource
 + SRC_PKG_NAME=python-os-service-types
-+ echo python-os-service-types
-+ sed s/python-//
+++ sed s/python-//
+++ echo python-os-service-types
 + PY_MODULE_NAME=os-service-types
-+ [ yes = yes ]
-+ pyversions -vr
++ '[' yes = yes ']'
+++ pyversions -vr
 + PYTHONS=2.7
-+ [ yes = yes ]
-+ py3versions -vr
++ '[' yes = yes ']'
+++ py3versions -vr
 + PYTHON3S=3.7
-+ [ yes = yes ]
-+ pwd
++ '[' yes = yes ']'
++ for pyvers in ${PYTHONS}
+++ pwd
 + python2.7 setup.py install --install-layout=deb --root /build/python-os-service-types-1.3.0/debian/python-os-service-types
 running install
 [pbr] Generating AUTHORS
-[pbr] AUTHORS complete (0.0s)
+[pbr] AUTHORS complete (0.1s)
 running build
 running build_py
 running egg_info
@@ -2765,8 +2805,9 @@
 running install_scripts
 /usr/lib/python2.7/dist-packages/pbr/packaging.py:407: EasyInstallDeprecationWarning: Use get_header
   header = easy_install.get_script_header("", executable, is_wininst)
-+ [ yes = yes ]
-+ pwd
++ '[' yes = yes ']'
++ for pyvers in ${PYTHON3S}
+++ pwd
 + python3.7 setup.py install --install-layout=deb --root /build/python-os-service-types-1.3.0/debian/python3-os-service-types
 running install
 [pbr] Generating AUTHORS
@@ -2775,6 +2816,9 @@
 running build_py
 creating build/lib
 creating build/lib/os_service_types
+copying os_service_types/service_types.py -> build/lib/os_service_types
+copying os_service_types/exc.py -> build/lib/os_service_types
+copying os_service_types/__init__.py -> build/lib/os_service_types
 creating build/lib/os_service_types/tests
 copying os_service_types/tests/test_warn.py -> build/lib/os_service_types/tests
 copying os_service_types/tests/test_singleton.py -> build/lib/os_service_types/tests
@@ -2784,9 +2828,6 @@
 copying os_service_types/tests/test_builtin.py -> build/lib/os_service_types/tests
 copying os_service_types/tests/base.py -> build/lib/os_service_types/tests
 copying os_service_types/tests/__init__.py -> build/lib/os_service_types/tests
-copying os_service_types/service_types.py -> build/lib/os_service_types
-copying os_service_types/exc.py -> build/lib/os_service_types
-copying os_service_types/__init__.py -> build/lib/os_service_types
 creating build/lib/os_service_types/data
 copying os_service_types/data/__init__.py -> build/lib/os_service_types/data
 running egg_info
@@ -2806,9 +2847,6 @@
 creating /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/data
 copying build/lib/os_service_types/data/service-types.json -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/data
 copying build/lib/os_service_types/data/__init__.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/data
-copying build/lib/os_service_types/__init__.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
-copying build/lib/os_service_types/exc.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
-copying build/lib/os_service_types/service_types.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
 creating /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
 copying build/lib/os_service_types/tests/__init__.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
 copying build/lib/os_service_types/tests/base.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
@@ -2818,10 +2856,10 @@
 copying build/lib/os_service_types/tests/test_remote.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
 copying build/lib/os_service_types/tests/test_singleton.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
 copying build/lib/os_service_types/tests/test_warn.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests
+copying build/lib/os_service_types/__init__.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
+copying build/lib/os_service_types/exc.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
+copying build/lib/os_service_types/service_types.py -> /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/data/__init__.py to __init__.cpython-37.pyc
-byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/__init__.py to __init__.cpython-37.pyc
-byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/exc.py to exc.cpython-37.pyc
-byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/service_types.py to service_types.cpython-37.pyc
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/__init__.py to __init__.cpython-37.pyc
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/base.py to base.cpython-37.pyc
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/test_builtin.py to test_builtin.cpython-37.pyc
@@ -2830,16 +2868,19 @@
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/test_remote.py to test_remote.cpython-37.pyc
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/test_singleton.py to test_singleton.cpython-37.pyc
 byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/tests/test_warn.py to test_warn.cpython-37.pyc
+byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/__init__.py to __init__.cpython-37.pyc
+byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/exc.py to exc.cpython-37.pyc
+byte-compiling /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types/service_types.py to service_types.cpython-37.pyc
 running install_egg_info
 Copying os_service_types.egg-info to /build/python-os-service-types-1.3.0/debian/python3-os-service-types/usr/lib/python3/dist-packages/os_service_types-1.3.0.egg-info
 Skipping SOURCES.txt
 running install_scripts
 /usr/lib/python3/dist-packages/pbr/packaging.py:407: EasyInstallDeprecationWarning: Use get_header
   header = easy_install.get_script_header("", executable, is_wininst)
-+ pwd
-+ rm -rf /build/python-os-service-types-1.3.0/debian/python*/usr/lib/python*/dist-packages/*.pth
-+ pwd
-+ [ -d /build/python-os-service-types-1.3.0/debian/python-os-service-types/usr/bin ]
+++ pwd
++ rm -rf '/build/python-os-service-types-1.3.0/debian/python*/usr/lib/python*/dist-packages/*.pth'
+++ pwd
++ '[' -d /build/python-os-service-types-1.3.0/debian/python-os-service-types/usr/bin ']'
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
    dh_installdocs -O--buildsystem=python_distutils
    debian/rules override_dh_sphinxdoc
@@ -2888,8 +2929,8 @@
 dh_sphinxdoc -O--buildsystem=python_distutils
 dh_sphinxdoc: ignoring unknown JavaScript code: debian/python-os-service-types-doc/usr/share/doc/python-os-service-types-doc/html/_static/js/docs.js
 dh_sphinxdoc: ignoring unknown JavaScript code: debian/python-os-service-types-doc/usr/share/doc/python-os-service-types-doc/html/_static/js/webui-popover.js
-dh_sphinxdoc: ignoring unknown JavaScript code: debian/python-os-service-types-doc/usr/share/doc/python-os-service-types-doc/html/_static/js/bootstrap.min.js
 dh_sphinxdoc: ignoring unknown JavaScript code: debian/python-os-service-types-doc/usr/share/doc/python-os-service-types-doc/html/_static/js/navigation.js
+dh_sphinxdoc: ignoring unknown JavaScript code: debian/python-os-service-types-doc/usr/share/doc/python-os-service-types-doc/html/_static/js/bootstrap.min.js
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
    debian/rules override_dh_installchangelogs
 make[1]: Entering directory '/build/python-os-service-types-1.3.0'
@@ -2914,14 +2955,14 @@
 	cat /usr/share/openstack-pkg-tools/init-script-template >>$MYINIT.init ; \
 	pkgos-gen-systemd-unit $i ; \
 done
-+ ls -1 debian/*.init.in
+++ ls -1 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 # If there's a service.in file, use that one instead of the generated one
 set -e ; set -x ; for i in `ls -1 debian/*.service.in`; do \
 	MYPKG=`echo $i | sed s/.service.in//` ; \
 	cp $MYPKG.service.in $MYPKG.service ; \
 done
-+ ls -1 debian/*.service.in
+++ ls -1 'debian/*.service.in'
 ls: cannot access 'debian/*.service.in': No such file or directory
 # Generate the systemd unit if there's no already existing .service.in
 set -e ; set -x ; for i in `ls debian/*.init.in` ; do \
@@ -2930,7 +2971,7 @@
 		pkgos-gen-systemd-unit $i ; \
 	fi \
 done
-+ ls debian/*.init.in
+++ ls 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 dh_systemd_enable
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
@@ -2948,14 +2989,14 @@
 	cat /usr/share/openstack-pkg-tools/init-script-template >>$MYINIT.init ; \
 	pkgos-gen-systemd-unit $i ; \
 done
-+ ls -1 debian/*.init.in
+++ ls -1 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 # If there's a service.in file, use that one instead of the generated one
 set -e ; set -x ; for i in `ls -1 debian/*.service.in`; do \
 	MYPKG=`echo $i | sed s/.service.in//` ; \
 	cp $MYPKG.service.in $MYPKG.service ; \
 done
-+ ls -1 debian/*.service.in
+++ ls -1 'debian/*.service.in'
 ls: cannot access 'debian/*.service.in': No such file or directory
 # Generate the systemd unit if there's no already existing .service.in
 set -e ; set -x ; for i in `ls debian/*.init.in` ; do \
@@ -2964,7 +3005,7 @@
 		pkgos-gen-systemd-unit $i ; \
 	fi \
 done
-+ ls debian/*.init.in
+++ ls 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 dh_installinit --error-handler=true
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
@@ -2985,15 +3026,15 @@
 else \
 	dh_gencontrol -- -T/build/python-os-service-types-1.3.0/debian/debian_control_vars ; \
 fi
-dpkg-gencontrol: warning: package python-os-service-types-doc: substitution variable ${sphinxdoc:Built-Using} unused, but is defined
 dpkg-gencontrol: warning: package python-os-service-types: substitution variable ${python:Provides} unused, but is defined
 dpkg-gencontrol: warning: package python-os-service-types: substitution variable ${python:Versions} unused, but is defined
+dpkg-gencontrol: warning: package python-os-service-types-doc: substitution variable ${sphinxdoc:Built-Using} unused, but is defined
 make[1]: Leaving directory '/build/python-os-service-types-1.3.0'
    dh_md5sums -O--buildsystem=python_distutils
    dh_builddeb -O--buildsystem=python_distutils
-dpkg-deb: building package 'python-os-service-types' in '../python-os-service-types_1.3.0-2_all.deb'.
 dpkg-deb: building package 'python-os-service-types-doc' in '../python-os-service-types-doc_1.3.0-2_all.deb'.
 dpkg-deb: building package 'python3-os-service-types' in '../python3-os-service-types_1.3.0-2_all.deb'.
+dpkg-deb: building package 'python-os-service-types' in '../python-os-service-types_1.3.0-2_all.deb'.
  dpkg-genbuildinfo --build=binary
  dpkg-genchanges --build=binary >../python-os-service-types_1.3.0-2_amd64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -3002,12 +3043,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3116192/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/2769122 and its subdirectories
-I: Current time: Fri Jan 13 05:50:17 -12 2023
-I: pbuilder-time-stamp: 1673632217
+I: removing directory /srv/workspace/pbuilder/3116192 and its subdirectories
+I: Current time: Sun Dec 12 01:33:09 +14 2021
+I: pbuilder-time-stamp: 1639222389