Skip to content

Commit

Permalink
Added/Reenabled sanity tests for Issue #184, #186, cleaned up decoder…
Browse files Browse the repository at this point in the history
… little bit.
  • Loading branch information
psykokwak4 committed Jul 22, 2016
1 parent deb9e5a commit c455a00
Show file tree
Hide file tree
Showing 7 changed files with 252 additions and 201 deletions.
1 change: 0 additions & 1 deletion sdk/python/tests/compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"""
import sys
from enum import Enum
from pdb import set_trace as bp
from ydk.types import Empty, Decimal64, FixedBitsDict, YList, YListItem, YLeafList

def is_builtin_type(attr):
Expand Down
27 changes: 26 additions & 1 deletion sdk/python/tests/test_sanity_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from ydk.providers import NetconfServiceProvider, NativeNetconfServiceProvider
from ydk.types import Empty, DELETE, Decimal64
from tests.compare import is_equal
from ydk.errors import YPYError, YPYModelError
from ydk.errors import YPYError, YPYModelError, YPYServiceError

from ydk.models.ydktest.ydktest_sanity import YdkEnumTestEnum, YdkEnumIntTestEnum

Expand Down Expand Up @@ -212,6 +212,31 @@ def test_enum_invalid(self):
else:
raise Exception('YPYModelError not raised')

def test_yleaflist_assignment(self):
try:
runner = self._create_runner()
runner.ytypes.built_in_t.llstring = ['invalid', 'leaf-list', 'assignment']
self.crud.create(self.ncc, runner)
except YPYServiceError as err:
expected_msg = "Assigned object to YLeafList Runner.Ytypes.BuiltInT. Use list append or extend method instead."
self.assertEqual(err.message.strip(), expected_msg)


def test_ylist_assignment(self):
try:
runner = self._create_runner()
elems, n = [], 10
for i in range(n):
l = ysanity.Runner.OneList.Ldata()
l.number = i
l.name = str(i)
elems.append(l)
runner.one_list.ldata = elems
self.crud.create(self.ncc, runner)
except YPYServiceError as err:
expected_msg = "Assigned object to YList Runner.OneList. Use list append or extend method instead."
self.assertEqual(err.message.strip(), expected_msg)

if __name__ == '__main__':
import sys
if len(sys.argv) > 1:
Expand Down
25 changes: 22 additions & 3 deletions sdk/python/tests/test_sanity_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,27 @@ def test_union_list(self):
result = is_equal(runner, runner1)
self.assertEqual(result, True)

def test_enum_list(self):
@unittest.skip('ConfD internal error.')
def test_bits_leaflist(self):
# User needs to append Bits instance manually to bits leaflist.
runner = self._create_runner()
bits_0 = runner.ytypes.built_in_t.BitsLlist_Bits()
bits_1 = runner.ytypes.built_in_t.BitsLlist_Bits()
bits_0['disable-nagle'] = True
bits_1['auto-sense-speed'] = True
runner.ytypes.built_in_t.bits_llist.extend([bits_0, bits_1])
self.crud.create(self.ncc, runner)

# Read into Runner1
runner1 = ysanity.Runner()
runner1 = self.crud.read(self.ncc, runner1)

# Compare runners
result = is_equal(runner ,runner1)
self.assertEqual(result, True)


def test_enum_leaflist(self):
runner = self._create_runner()
runner.ytypes.built_in_t.enum_llist.append(YdkEnumTestEnum.LOCAL)
runner.ytypes.built_in_t.enum_llist.append(YdkEnumTestEnum.REMOTE)
Expand All @@ -368,8 +388,7 @@ def test_enum_list(self):
result = is_equal(runner, runner1)
self.assertEqual(result, True)

@unittest.skip("Doesn't work")
def test_identity_list(self):
def test_identity_leaflist(self):
runner = self._create_runner()
runner.ytypes.built_in_t.identity_llist.append(ysanity.ChildIdentityIdentity())
runner.ytypes.built_in_t.identity_llist.append(ysanity.ChildChildIdentityIdentity())
Expand Down
Loading

0 comments on commit c455a00

Please sign in to comment.