summaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/bts_osmo.py
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-08-09 13:45:55 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-08-13 07:51:58 +0000
commit58603671c21b0af30d0d52fec862c5843c6e50d0 (patch)
treecb7f8b4fb0fca3e7895d8ffcab8c8a3cf91d1537 /src/osmo_gsm_tester/bts_osmo.py
parent6caa5c11674d8b0041939b3488c8d9a517edc805 (diff)
Cleanup of class scoped variables
After bug described in OS#3456 and fixed in last commit, let's categorize and place variables in its correct plac to avoid similar issus. We leave under the class keyword (class scoped variables) the attributes which are to be used as static class attributes. All other ones are initialized during __init__(). This way w avoid scenarios in which while using an object from an instance attribute we end up reading a class scoped variable which is shared among all instances. Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8
Diffstat (limited to 'src/osmo_gsm_tester/bts_osmo.py')
-rw-r--r--src/osmo_gsm_tester/bts_osmo.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py
index b9b7fef..32784bd 100644
--- a/src/osmo_gsm_tester/bts_osmo.py
+++ b/src/osmo_gsm_tester/bts_osmo.py
@@ -24,14 +24,14 @@ from abc import ABCMeta, abstractmethod
from . import log, config, util, template, process, bts, pcu_osmo
class OsmoBts(bts.Bts, metaclass=ABCMeta):
- proc_bts = None
- _pcu = None
##############
# PROTECTED
##############
def __init__(self, suite_run, conf, name, defaults_cfg_name):
super().__init__(suite_run, conf, name, defaults_cfg_name)
+ self._pcu = None
+ self.proc_bts = None
if len(self.pcu_socket_path().encode()) > 107:
raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path())
@@ -75,9 +75,9 @@ class OsmoBtsMainUnit(OsmoBts, metaclass=ABCMeta):
##############
# PROTECTED
##############
- pcu_sk_tmp_dir = None
def __init__(self, suite_run, conf, name, defaults_cfg_name):
+ self.pcu_sk_tmp_dir = None
super().__init__(suite_run, conf, name, defaults_cfg_name)
########################