4 files changed, 24 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 96802fbc..3ff688a8 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ build:
 bin/curtin: curtin/pack.py tools/write-curtin
 	$(PYTHON) tools/write-curtin bin/curtin
 
-check: pep8 pyflakes pyflakes3 unittest checkcmd
+check: pep8 pyflakes pyflakes3 unittest
 
 coverage: coverageopts ?= $(DEFAULT_COVERAGEOPTS)
 coverage: unittest
@@ -29,9 +29,6 @@ pyflakes:
 pyflakes3:
 	@$(CWD)/tools/run-pyflakes3
 
-checkcmd:
-	@$(CWD)/tools/check-apt.sh
-
 unittest:
 	nosetests $(coverageopts) $(noseopts) tests/unittests
 	nosetests3 $(coverageopts) $(noseopts) tests/unittests
diff --git a/examples/tests/apt_source_cmd.yaml b/examples/tests/apt_source_cmd.yaml
deleted file mode 100644
index f076be2c..00000000
--- a/examples/tests/apt_source_cmd.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-showtrace: true
-# this config actually doesn't do anything, so it can be used for minimal
-# command testing runnign some of the code in that scope
-apt:
-  preserve_sources_list: true
-  primary:
-    - arches: [default]
-      uri: http://us.archive.ubuntu.com/ubuntu
-  security:
-    - arches: [default]
-      uri: http://security.ubuntu.com/ubuntu
diff --git a/examples/tests/apt_source_command.yaml b/examples/tests/apt_source_command.yaml
new file mode 100644
index 00000000..5fff80c2
--- /dev/null
+++ b/examples/tests/apt_source_command.yaml
@@ -0,0 +1,4 @@
+showtrace: true
+late_commands:
+  # picks up target from TARGET_MOUNT_POINT environment variable
+  test_apt_as_command: ['curtin', '-v', '--config', '-', 'apt', '<<<', '''{ "apt": { "sources": { "my-repo4.list": { "source": "deb http://ppa.launchpad.net/alestic/ppa/ubuntu xenial main", "key": "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v1\n\n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\n7oh88hTkC1w=\n=UNSw\n-----END PGP PUBLIC KEY BLOCK-----\n" }, "ignored3": { "keyid": "0E72 9061 0D2F 6DC4 D65E  A921 9A31 4EC5 F470 A0AC" }, "my-repo2.list": { "source": "deb $MIRROR $RELEASE multiverse" }, "ignored1": { "source": "ppa:smoser/ppa" }, "byobu-ppa.list": { "source": "deb http://ppa.launchpad.net/byobu/ppa/ubuntu xenial main", "keyid": "F430BBA5" } }, "security": [ { "arches": [ "default" ], "uri": "http://security.ubuntu.com/ubuntu" } ], "primary": [ { "arches": [ "default" ], "uri": "http://us.archive.ubuntu.com/ubuntu" } ], "conf": "ACQUIRE {\n  Retries \"3\";\n};\n" }, "showtrace": true }''']
diff --git a/tests/vmtests/test_apt_source.py b/tests/vmtests/test_apt_source.py
index c83f6ed9..6ee4d9ee 100644
--- a/tests/vmtests/test_apt_source.py
+++ b/tests/vmtests/test_apt_source.py
@@ -168,6 +168,11 @@ class TestAptSrcModifyArches(TestAptSrcModify):
     conf_file = "examples/tests/apt_source_modify_arches.yaml"
 
 
+class TestAptSrcModifyCMD(TestAptSrcModify):
+    """TestAptSrcModify - like TestAptSrcModify, but via standaline command"""
+    conf_file = "examples/tests/apt_source_command.yaml"
+
+
 class TestAptSrcSearch(TestAptSrcAbs):
     """TestAptSrcSearch - tests checking a list of mirror options"""
     conf_file = "examples/tests/apt_source_search.yaml"
@@ -228,48 +233,55 @@ class TestAptSrcSearchDNS(VMBaseClass):
 
 class XenialTestAptSrcCustom(relbase.xenial, TestAptSrcCustom):
     """ XenialTestAptSrcCustom
-       Apt_source Test for Xenial with a custom template
+       apt feature Test for Xenial with a custom template
     """
     __test__ = True
 
 
 class XenialTestAptSrcPreserve(relbase.xenial, TestAptSrcPreserve):
     """ XenialTestAptSrcPreserve
-       Apt_source Test for Xenial with apt_preserve_sources_list enabled
+       apt feature Test for Xenial with apt_preserve_sources_list enabled
     """
     __test__ = True
 
 
 class XenialTestAptSrcModify(relbase.xenial, TestAptSrcModify):
     """ XenialTestAptSrcModify
-        Apt_source Test for Xenial modifying the sources.list of the image
+        apt feature Test for Xenial modifying the sources.list of the image
     """
     __test__ = True
 
 
 class XenialTestAptSrcSearch(relbase.xenial, TestAptSrcSearch):
     """ XenialTestAptSrcModify
-        Apt_source Test for Xenial searching for mirrors
+        apt feature Test for Xenial searching for mirrors
     """
     __test__ = True
 
 
 class XenialTestAptSrcSearchDNS(relbase.xenial, TestAptSrcSearchDNS):
     """ XenialTestAptSrcModify
-        Apt_source Test for Xenial searching for predefined DNS names
+        apt feature Test for Xenial searching for predefined DNS names
     """
     __test__ = True
 
 
 class XenialTestAptSrcModifyArches(relbase.xenial, TestAptSrcModifyArches):
     """ XenialTestAptSrcModifyArches
-        Apt_source Test for Xenial checking per arch mirror specification
+        apt feature Test for Xenial checking per arch mirror specification
     """
     __test__ = True
 
 
 class XenialTestAptSrcDisablePockets(relbase.xenial, TestAptSrcDisablePockets):
     """ XenialTestAptSrcDisablePockets
-        Apt_source Test for Xenial disabling a suite
+        apt feature Test for Xenial disabling a suite
+    """
+    __test__ = True
+
+
+class XenialTestAptSrcModifyCMD(relbase.xenial, TestAptSrcModifyCMD):
+    """ XenialTestAptSrcModifyCMD
+        apt feature Test for Xenial using the standalone command
     """
     __test__ = True