Fix of build_url method and update of the gogs test init env

Signed-off-by: Guyzmo <[email protected]>

Author: pyhedgehog

git_repo/services/ext/gogs.py

@@ -32,6 +32,8 @@ def set_default_private(self, p):
     def setup_session(self, ssl_config, proxy=dict()):
         self.session.verify = ssl_config
         self.session.proxies.update(proxy)
+        # this is required to detect fresh GoGS server that redirects everything to /install
+        self.session.max_redirects = 0
 
     @property
     def username(self):
@@ -102,7 +104,7 @@ def connect(self):
     def get_auth_token(cls, login, password, prompt=None):
         import platform
         name = 'git-repo token used on {}'.format(platform.node())
-        gg = GogsApi(cls.build_url())
+        gg = GogsApi(cls.build_url(cls))
         auth = UsernamePassword(login, password)
         tokens = gg.get_tokens(auth, login)
         tokens = dict((token.name, token.token) for token in tokens)

git_repo/services/service.py

@@ -203,17 +203,23 @@ def __init__(self, r=None, c=None, hc=[]):
     '''name of the git user to use for SSH remotes'''
     git_user = 'git'
 
-    @classmethod
-    def build_url(cls):
-        netloc = cls.fqdn if not getattr(cls, 'port', None) else '{}:{}'.format(cls.fqdn, cls.port)
-        if not getattr(cls, 'scheme', None):
-            cls.scheme = 'https'
-        return ParseResult(cls.scheme, netloc, *['']*4).geturl()
+    @staticmethod
+    def build_url(obj):
+        scheme = getattr(obj, 'scheme', 'https')
+        port = getattr(obj, 'port', None)
+        # skip useless port specification
+        if (not port
+            or scheme == 'https' and str(port) == '443'
+            or scheme == 'http' and str(port) == '80'):
+            netloc = obj.fqdn
+        else:
+            netloc = '{}:{}'.format(obj.fqdn, port)
+        return ParseResult(scheme, netloc, *['']*4).geturl()
 
     @property
     def url_ro(self):
         '''Property that returns the HTTP URL of the service'''
-        return self.build_url()
+        return self.build_url(self)
 
     @property
     def url_rw(self):

tests/integration/local/gogs/README.md

@@ -1,8 +1,14 @@
-## Steps to re-create test environment
-
- * `cd <path to git-repo>/tests/integration/local/gogs`
- * `./init_conf.sh` # this will change `custom/conf/app.ini` as repository/ROOT must be full path
- * `<path to gogs>/gogs web --config custom/conf/app.ini` # run with local config. Gitea also supported
- * `./init.sh` # this will create users, organizations and repositories required for testing. Server must be completely started (listeninig)
-
-Under Windows cygwin bash required for scripts (mingw/msys not tested).
+## Steps to re-create test environment
+
+ * `cd <path to git-repo>/tests/integration/local/gogs`
+ * `./init_conf.sh` # this will change `custom/conf/app.ini` as repository/ROOT must be full path
+ * `<path to gogs>/gogs web --config custom/conf/app.ini` # run with local config. Gitea also supported
+ * `./init.sh` # this will create users, organizations and repositories required for testing. Server must be completely started (listeninig)
+
+Under Windows cygwin bash required for scripts (mingw/msys not tested).
+
+## Steps to setup test parameters
+
+ * `export PRIVATE_KEY_GOGS=...` # value printed by `init.sh` script
+ * `GOGS_NAMESPACE=git-repo-test`
+ * `GOGS_URL=http://127.0.0.1:3000`

tests/integration/local/gogs/custom/conf/app.ini

@@ -1,56 +1,56 @@
-APP_NAME = git-repo gogs test
-RUN_USER = git
-RUN_MODE = prod
-
-[repository]
-ROOT = gogs-repositories
-
-[database]
-DB_TYPE  = sqlite3
-HOST     = 127.0.0.1:3306
-NAME     = gogs
-USER     = root
-PASSWD   = 
-SSL_MODE = true
-PATH     = data/gogs.db
-
-[server]
-DOMAIN       = 127.0.0.1
-PROTOCOL     = http
-HTTP_ADDR    = 127.0.0.1
-HTTP_PORT    = 3000
-ROOT_URL     = http://127.0.0.1:3000/
-DISABLE_SSH  = false
-START_SSH_SERVER = true
-SSH_PORT     = 3022
-OFFLINE_MODE = true
-
-[mailer]
-ENABLED = false
-
-[service]
-REGISTER_EMAIL_CONFIRM = false
-ENABLE_NOTIFY_MAIL     = false
-DISABLE_REGISTRATION   = true
-ENABLE_CAPTCHA         = false
-REQUIRE_SIGNIN_VIEW    = false
-
-[picture]
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
-
-[session]
-PROVIDER = file
-
-[log]
-MODE      = file
-LEVEL     = Info
-ROOT_PATH = log
-
-[security]
-INSTALL_LOCK = true
-
-[attachment]
-ENABLED = true
-PATH = private
-ALLOWED_TYPES = */*
+APP_NAME = git-repo gogs test
+RUN_USER = git
+RUN_MODE = prod
+
+[repository]
+ROOT = gogs-repositories
+
+[database]
+DB_TYPE = sqlite3
+HOST = 127.0.0.1:3306
+NAME = gogs
+USER = root
+PASSWD = 
+SSL_MODE = true
+PATH = data/gogs.db
+
+[server]
+DOMAIN = 127.0.0.1
+PROTOCOL = http
+HTTP_ADDR = 127.0.0.1
+HTTP_PORT = 3000
+ROOT_URL = http://127.0.0.1:3000/
+DISABLE_SSH = false
+START_SSH_SERVER = true
+SSH_PORT = 3022
+OFFLINE_MODE = true
+
+[mailer]
+ENABLED = false
+
+[service]
+REGISTER_EMAIL_CONFIRM = false
+ENABLE_NOTIFY_MAIL = false
+DISABLE_REGISTRATION = true
+ENABLE_CAPTCHA = false
+REQUIRE_SIGNIN_VIEW = false
+
+[picture]
+DISABLE_GRAVATAR = false
+ENABLE_FEDERATED_AVATAR = false
+
+[session]
+PROVIDER = file
+
+[log]
+MODE = file
+LEVEL = Info
+ROOT_PATH = log
+
+[security]
+INSTALL_LOCK = true
+
+[attachment]
+ENABLED = true
+PATH = private
+ALLOWED_TYPES = */*

tests/integration/local/gogs/init.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
 echo "Checking user test-admin in Gogs on http://127.0.0.1:3000"
-if python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('test-admin','test-admin');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.valid_authentication(up))" ; then
+if ! python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('test-admin','test-admin');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.authenticated_user(up).user_id<1)" 2>/dev/null ; then
   echo "Creating admin user test-admin"
   gogs admin create-user --config custom/conf/app.ini --name=test-admin --password=test-admin [email protected] --admin=true
 fi
 echo "Checking user other in Gogs on http://127.0.0.1:3000"
-if python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('other','other');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.valid_authentication(up))" ; then
+if ! python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('other','other');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.authenticated_user(up).user_id<1)" 2>/dev/null ; then
   echo "Creating user other"
   gogs admin create-user --config custom/conf/app.ini --name=other --password=other [email protected]
   python3 -c "import os,gogs_client,functools;up=gogs_client.UsernamePassword('other','other');s=gogs_client.GogsApi('http://127.0.0.1:3000');r=s.create_repo(up,'git-repo',readme_template='Default',license_template='MIT License',auto_init=True);print('\t'.join(map(str,(r.repo_id,r.full_name,r.urls.ssh_url))))"
 fi
 echo "Checking user git-repo-test in Gogs on http://127.0.0.1:3000"
-if python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('git-repo-test','git-repo-test');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.valid_authentication(up))" ; then
+if ! python3 -c "import sys,gogs_client;up=gogs_client.UsernamePassword('git-repo-test','git-repo-test');s=gogs_client.GogsApi('http://127.0.0.1:3000');sys.exit(s.authenticated_user(up).user_id<1)" 2>/dev/null ; then
   echo "Creating user git-repo-test"
   gogs admin create-user --config custom/conf/app.ini --name=git-repo-test --password=git-repo-test [email protected]
 fi

tests/integration/local/gogs/init_conf.sh

@@ -4,4 +4,4 @@ if [[ `uname -o` == Cygwin ]] ; then
 else
   GOGS_ROOT=$(pwd)'/gogs-repositories'
 fi
-python3 -c "import sys;from six.moves.configparser import ConfigParser;from six.moves import cStringIO;c=ConfigParser();c.read_string('[APP]\n'+open('custom/conf/app.ini').read());gogsroot=sys.argv[1].replace('\\\\','/');[lambda:0,sys.exit][c.get('repository','ROOT')==gogsroot]();f=cStringIO();c.set('repository','ROOT',gogsroot);print(c.get('repository','ROOT'));c.write(f);open('custom/conf/app.ini','w').write(f.getvalue().replace('[APP]\n',''))" "$GOGS_ROOT"
+python3 -c "import sys;from configparser import RawConfigParser;from six.moves import cStringIO;C=type('C',(RawConfigParser,),dict(optionxform=lambda s,o:o));c=C();c.read_string('[APP]\n'+open('custom/conf/app.ini').read());gogsroot=sys.argv[1].replace('\\\\','/');[lambda:0,sys.exit][c.get('repository','ROOT')==gogsroot]();f=cStringIO();c.set('repository','ROOT',gogsroot);print(c.get('repository','ROOT'));c.write(f);open('custom/conf/app.ini','w').write(f.getvalue().replace('[APP]\n',''))" "$GOGS_ROOT"