Use '_' instead of '-' for python scripts for test

14 files changed, 6 insertions, 7 deletions

diff --git a/src/conf-mode/vyos-config-bcast-relay.py b/src/conf_mode/vyos_config_bcast_relay.py
index 785690d9c..785690d9c 100755
--- a/src/conf-mode/vyos-config-bcast-relay.py
+++ b/src/conf_mode/vyos_config_bcast_relay.py
diff --git a/src/conf-mode/vyos-config-dns-forwarding.py b/src/conf_mode/vyos_config_dns_forwarding.py
index be48cde60..be48cde60 100755
--- a/src/conf-mode/vyos-config-dns-forwarding.py
+++ b/src/conf_mode/vyos_config_dns_forwarding.py
diff --git a/src/conf-mode/vyos-config-host-name.py b/src/conf_mode/vyos_config_host_name.py
index 2a245b211..2a245b211 100755
--- a/src/conf-mode/vyos-config-host-name.py
+++ b/src/conf_mode/vyos_config_host_name.py
diff --git a/src/conf-mode/vyos-config-lldp.py b/src/conf_mode/vyos_config_lldp.py
index ba7e9cb13..ba7e9cb13 100644
--- a/src/conf-mode/vyos-config-lldp.py
+++ b/src/conf_mode/vyos_config_lldp.py
diff --git a/src/conf-mode/vyos-config-mdns-repeater.py b/src/conf_mode/vyos_config_mdns_repeater.py
index e648fd64f..e648fd64f 100755
--- a/src/conf-mode/vyos-config-mdns-repeater.py
+++ b/src/conf_mode/vyos_config_mdns_repeater.py
diff --git a/src/conf-mode/vyos-config-ntp.py b/src/conf_mode/vyos_config_ntp.py
index 8be12e44e..8be12e44e 100755
--- a/src/conf-mode/vyos-config-ntp.py
+++ b/src/conf_mode/vyos_config_ntp.py
diff --git a/src/conf-mode/vyos-config-ssh.py b/src/conf_mode/vyos_config_ssh.py
index a4857bba9..a4857bba9 100755
--- a/src/conf-mode/vyos-config-ssh.py
+++ b/src/conf_mode/vyos_config_ssh.py
diff --git a/src/conf-mode/vyos-update-crontab.py b/src/conf_mode/vyos_update_crontab.py
index c19b88007..c19b88007 100755
--- a/src/conf-mode/vyos-update-crontab.py
+++ b/src/conf_mode/vyos_update_crontab.py
diff --git a/src/op-mode/vyos-dns-forwarding-statistics.py b/src/op_mode/vyos_dns_forwarding_statistics.py
index 3d1e30aee..3d1e30aee 100755
--- a/src/op-mode/vyos-dns-forwarding-statistics.py
+++ b/src/op_mode/vyos_dns_forwarding_statistics.py
diff --git a/src/op-mode/vyos-list-dumpable-interfaces.py b/src/op_mode/vyos_list_dumpable_interfaces.py
index 53ee89633..53ee89633 100755
--- a/src/op-mode/vyos-list-dumpable-interfaces.py
+++ b/src/op_mode/vyos_list_dumpable_interfaces.py
diff --git a/src/op-mode/vyos-list-interfaces.py b/src/op_mode/vyos_list_interfaces.py
index 59c9dffad..59c9dffad 100755
--- a/src/op-mode/vyos-list-interfaces.py
+++ b/src/op_mode/vyos_list_interfaces.py
diff --git a/src/op-mode/vyos-restart-dns-forwarding.sh b/src/op_mode/vyos_restart_dns_forwarding.sh
index 12106fcc1..12106fcc1 100755
--- a/src/op-mode/vyos-restart-dns-forwarding.sh
+++ b/src/op_mode/vyos_restart_dns_forwarding.sh
diff --git a/src/op-mode/vyos-show-version.py b/src/op_mode/vyos_show_version.py
index ce3b3b54f..ce3b3b54f 100755
--- a/src/op-mode/vyos-show-version.py
+++ b/src/op_mode/vyos_show_version.py
diff --git a/src/tests/test_vyos_update_crontab.py b/src/tests/test_vyos_update_crontab.py
index efeadf2f5..180871300 100644
--- a/src/tests/test_vyos_update_crontab.py
+++ b/src/tests/test_vyos_update_crontab.py
@@ -17,17 +17,16 @@
 #
 
 import os
-import sys
 import tempfile
 import unittest
 
 from vyos import ConfigError
-import helper
-
-file_path = 'src/conf-mode/vyos-update-crontab.py'
-module_name = 'vyos_update_crontab'
-helper.prepare_module(file_path, module_name)
-import vyos_update_crontab
+try:
+    from src.conf_mode import vyos_update_crontab
+except ModuleNotFoundError:  # for unittest.main()
+    import sys
+    sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+    from src.conf_mode import vyos_update_crontab
 
 
 class TestUpdateCrontab(unittest.TestCase):