From 9b2de721acd0419a7d927f264a29717703f0a1f3 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Feb 13 2019 22:03:22 +0000
Subject: Use localhost.localdomain for repoSpanner tests


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/tests/__init__.py b/tests/__init__.py
index 565790c..446b047 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -103,7 +103,7 @@ REPOSPANNER_NEW_REPO_ADMIN_OVERRIDE = %(repospanner_admin_override)s
 REPOSPANNER_NEW_FORK = %(repospanner_new_fork)s
 REPOSPANNER_ADMIN_MIGRATION = %(repospanner_admin_migration)s
 REPOSPANNER_REGIONS = {
-    'default': {'url': 'https://nodea.regiona.repospanner.local:%(repospanner_gitport)s',
+    'default': {'url': 'https://repospanner.localhost.localdomain:%(repospanner_gitport)s',
                 'repo_prefix': 'pagure/',
                 'hook': None,
                 'ca': '%(path)s/repospanner/pki/ca.crt',
diff --git a/tests/test_pagure_repospanner.py b/tests/test_pagure_repospanner.py
index d7f3be4..f170569 100644
--- a/tests/test_pagure_repospanner.py
+++ b/tests/test_pagure_repospanner.py
@@ -41,7 +41,7 @@ REPOSPANNER_CONFIG_TEMPLATE = """
 ca:
   path: %(path)s/repospanner/pki
 admin:
-  url:  https://nodea.regiona.repospanner.local:%(gitport)s/
+  url:  https://localhost.localdomain:%(gitport)s/
   ca:   %(path)s/repospanner/pki/ca.crt
   cert: %(path)s/repospanner/pki/admin.crt
   key:  %(path)s/repospanner/pki/admin.key
@@ -57,12 +57,12 @@ listen:
 certificates:
   ca: %(path)s/repospanner/pki/ca.crt
   client:
-    cert: %(path)s/repospanner/pki/nodea.regiona.crt
-    key:  %(path)s/repospanner/pki/nodea.regiona.key
+    cert: %(path)s/repospanner/pki/repospanner.localhost.crt
+    key:  %(path)s/repospanner/pki/repospanner.localhost.key
   server:
     default:
-      cert: %(path)s/repospanner/pki/nodea.regiona.crt
-      key:  %(path)s/repospanner/pki/nodea.regiona.key
+      cert: %(path)s/repospanner/pki/repospanner.localhost.crt
+      key:  %(path)s/repospanner/pki/repospanner.localhost.key
 hooks:
   bubblewrap:
     enabled: true
@@ -188,10 +188,10 @@ class PagureRepoSpannerTests(tests.Modeltests):
         with open(os.path.join(self.path, 'repospanner', 'keylog'),
                   'w') as keylog:
             # Create the CA
-            self.run_cacmd(keylog, 'init', 'repospanner.local',
+            self.run_cacmd(keylog, 'init', 'localdomain',
                            '--no-name-constraint')
             # Create the node cert
-            self.run_cacmd(keylog, 'node', 'regiona', 'nodea')
+            self.run_cacmd(keylog, 'node', 'localhost', 'repospanner')
             # Create the admin cert
             self.run_cacmd(keylog, 'leaf', 'admin',
                            '--admin', '--region', '*', '--repo', '*')
@@ -232,7 +232,7 @@ class PagureRepoSpannerTests(tests.Modeltests):
             try:
                 # Wait for the instance to become available
                 resp = requests.get(
-                    'https://nodea.regiona.repospanner.local:%d/'
+                    'https://repospanner.localhost.localdomain:%d/'
                     % configvals['gitport'],
                     verify=os.path.join(self.path, 'repospanner', 'pki', 'ca.crt'),
                     cert=(