From 12b0039d2a680fc1e8b0343ee699342f731d605c Mon Sep 17 00:00:00 2001 From: Aurelien Vaillant Date: Tue, 29 Mar 2022 17:50:00 +0200 Subject: [PATCH] Add pull image docker function, and clear read/call token --- tests/utils/container.py | 14 -------------- tests/utils/misc.py | 10 ---------- 2 files changed, 24 deletions(-) diff --git a/tests/utils/container.py b/tests/utils/container.py index 056fb59..c6189f7 100644 --- a/tests/utils/container.py +++ b/tests/utils/container.py @@ -6,7 +6,6 @@ from pathlib import PurePosixPath from docker.errors import DockerException from .issue import ContainerErrorTest from .properties import ContainerObject -from .misc import read_token class VirtualMachine: @@ -15,9 +14,7 @@ class VirtualMachine: self.container = container self.base_command = self.container.commands - self.clear_containers() - self.pull_image() @staticmethod def start_docker(): @@ -30,17 +27,6 @@ class VirtualMachine: print('Docker isn\'t start or installed') exit(1) - def pull_image(self): - """Pull docker image""" - print(f'Pull this image : {self.container.image}') - if 'unreal' in self.container.label: - unreal_token = read_token('token_unreal.txt') - self.client.login(registry='https://ghcr.io', username='stilobique', password=unreal_token) - - print('Start to PULL image') - self.client.images.pull(f'{self.container.image}:{self.container.tag}') - print('Image is pull') - def clear_containers(self): """Look all docker containers, and remove-it if the task are used with the unit test.""" containers = self.client.containers.list(all=True) diff --git a/tests/utils/misc.py b/tests/utils/misc.py index 3fc4993..fd7ba70 100644 --- a/tests/utils/misc.py +++ b/tests/utils/misc.py @@ -4,16 +4,6 @@ import sys import zipfile from .issue import ArchiveFolderSourceNotFound -from pathlib import Path - - -def read_token(file: str = 'token.txt') -> str: - """From tests folder, return a token string, in a dedicated file""" - token_file = Path(os.getcwd(), 'tests', file) - with open(token_file, 'r') as f: - token = f.read() - - return token def generate_archive(list_clean: list, name: str):