selftests: Fix the avocado-result-html pkg name

The html plugin uses entry-point "avocado_result_html", but the pkg name
is "avocado-framework-plugin-result-html" and that is what
"pkg_resources.require" accepts.

This required few tweaks related to recent changes to html plugin which
produces a single result file instead of multiple files.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>

selftests/functional/test_basic.py

@@ -1035,9 +1035,9 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
         result_plugins = ["json", "xunit", "zip_archive"]
         result_outputs = ["results.json", "results.xml"]
         try:
-            pkg_resources.require('avocado_result_html')
+            pkg_resources.require('avocado-framework-plugin-result-html')
             result_plugins.append("html")
-            result_outputs.append("html/results.html")
+            result_outputs.append("results.html")
         except pkg_resources.DistributionNotFound:
             pass
 

selftests/functional/test_output.py

@@ -77,7 +77,7 @@ def image_output_uncapable():
 
 def html_uncapable():
     try:
-        pkg_resources.require('avocado_result_html')
+        pkg_resources.require('avocado-framework-plugin-result-html')
         return False
     except pkg_resources.DistributionNotFound:
         return True
@@ -264,7 +264,7 @@ class OutputPluginTest(unittest.TestCase):
         tmpfile = tempfile.mktemp(prefix='avocado_' + __name__)
         tmpfile2 = tempfile.mktemp(prefix='avocado_' + __name__)
         tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__)
-        tmpfile3 = tempfile.mktemp(dir=tmpdir)
+        tmpfile3 = os.path.join(tmpdir, "result.html")
         cmd_line = ('%s run --job-results-dir %s --sysinfo=off '
                     '--xunit %s --json %s --html %s passtest.py'
                     % (AVOCADO, self.tmpdir, tmpfile, tmpfile2, tmpfile3))
@@ -272,8 +272,9 @@ class OutputPluginTest(unittest.TestCase):
         output = result.stdout + result.stderr
         expected_rc = exit_codes.AVOCADO_ALL_OK
         tmpdir_contents = os.listdir(tmpdir)
-        self.assertEqual(len(tmpdir_contents), 4,
-                         'Not all resources dir were created: %s' % tmpdir_contents)
+        self.assertEqual(len(tmpdir_contents), 1, "Html plugin generated "
+                         "extra files in the result dir: %s"
+                         % tmpdir_contents)
         try:
             self.assertEqual(result.exit_status, expected_rc,
                              "Avocado did not return rc %d:\n%s" %