Commit 32230f06 authored by Hrvoje Ribicic's avatar Hrvoje Ribicic

Fix mismerge by correcting test import

Signed-off-by: default avatarHrvoje Ribicic <>
Reviewed-by: default avatarKlaus Aehlig <>
parent 81d4ddb0
......@@ -49,7 +49,7 @@ from ganeti import pathutils
from ganeti import serializer
from ganeti import ssh
from ganeti import utils
from cmdlib.testsupport.config_mock import ConfigMock
from testutils.config_mock import ConfigMock
class TestX509Certificates(unittest.TestCase):
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment