diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-15 16:19:28 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-15 16:19:28 -0800 |
| commit | dc951f511043d828a7ebc00a2af151ce2e9af4fc (patch) | |
| tree | 24f91f81b9e3577d2410c029edbc1263184ee282 | |
| parent | ce395c934258bc64e8efcd75e202006e0b18d201 (diff) | |
| parent | 69ad966a29575679a9ac77975b3352ba29a68139 (diff) | |
| download | uhd-dc951f511043d828a7ebc00a2af151ce2e9af4fc.tar.gz uhd-dc951f511043d828a7ebc00a2af151ce2e9af4fc.tar.bz2 uhd-dc951f511043d828a7ebc00a2af151ce2e9af4fc.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/lib/usrp/n230/n230_impl.cpp | 4 | ||||
| -rwxr-xr-x | host/tests/devtest/uhd_test_base.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp index 24ef5d97d..015140fcc 100644 --- a/host/lib/usrp/n230/n230_impl.cpp +++ b/host/lib/usrp/n230/n230_impl.cpp @@ -201,8 +201,8 @@ n230_impl::n230_impl(const uhd::device_addr_t& dev_addr) //Initialize addresses std::vector<std::string> ip_addrs(1, dev_addr["addr"]); - if (dev_addr.has_key("secondary-addr")) { - ip_addrs.push_back(dev_addr["secondary-addr"]); + if (dev_addr.has_key("second_addr")) { + ip_addrs.push_back(dev_addr["second_addr"]); } //Read EEPROM and perform version checks before talking to HW diff --git a/host/tests/devtest/uhd_test_base.py b/host/tests/devtest/uhd_test_base.py index 07a95ae3d..ae094c94b 100755 --- a/host/tests/devtest/uhd_test_base.py +++ b/host/tests/devtest/uhd_test_base.py @@ -57,6 +57,7 @@ class uhd_test_case(unittest.TestCase): if self.results_file and os.path.isfile(self.results_file): self.results = yaml.safe_load(open(self.results_file).read()) or {} self.args_str = os.getenv('_UHD_TEST_ARGS_STR', "") + time.sleep(15) # Wait for x300 devices to reclaim them self.usrp_info = get_usrp_list(self.args_str)[0] if not self.results.has_key(self.usrp_info['serial']): self.results[self.usrp_info['serial']] = {} |