Fix indent in to_dict method in image_layer class

Due to the indent, the ImageLayer class's to_dict method was
returning an empty dictionary. Fixed indent.

Also fixed failing image_layer test.
Resolves tern-tools#96

Signed-off-by: Nisha K <[email protected]>

classes/image_layer.py

@@ -106,10 +106,10 @@ def to_dict(self):
  pkg_list = []
  for pkg in self.__packages:
  pkg_list.append(pkg.to_dict())
-  layer_dict.update({self.fs_hash: {'packages': pkg_list,
-  'tar_file': self.__tar_file,
-  'created_by': self.__created_by
-  }})
+ layer_dict.update({self.fs_hash: {'packages': pkg_list,
+ 'tar_file': self.tar_file,
+ 'created_by': self.created_by
+ }})
  return layer_dict
 
  def get_package_names(self):

tests/test_class_image_layer.py

@@ -1,13 +1,12 @@
 '''
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2017-2018 VMware, Inc. All Rights Reserved.
 SPDX-License-Identifier: BSD-2-Clause
 '''
 
 import unittest
 
 from classes.image_layer import ImageLayer
 from classes.package import Package
-from classes.notice import Notice
 
 
 class TestClassImageLayer(unittest.TestCase):
@@ -43,19 +42,14 @@ def testRemovePackage(self):
  self.assertTrue(self.layer.remove_package('y'))
  self.assertFalse(self.layer.remove_package('y'))
 
- def testAddNotice(self):
- n = Notice()
- self.layer.add_notice(n)
- self.assertEqual(len(self.layer.notices), 1)
-
  def testToDict(self):
  p1 = Package('x')
  self.layer.add_package(p1)
  a_dict = self.layer.to_dict()
- self.assertTrue(a_dict['123abc'])
- self.assertEqual(len(a_dict['123abc']['packages']), 1)
- self.assertEqual(a_dict['123abc']['packages'][0]['name'], 'x')
- self.assertEqual(a_dict['123abc']['tar_file'], 'path/to/tar')
+ self.assertTrue(a_dict[''])
+ self.assertEqual(len(a_dict['']['packages']), 1)
+ self.assertEqual(a_dict['']['packages'][0]['name'], 'x')
+ self.assertEqual(a_dict['']['tar_file'], 'path/to/tar')
 
  def testGetPackageNames(self):
  p1 = Package('x')