← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

« back to all changes in this revision

Viewing changes to charmworld/tests/test_search.py

  • Committer: Tarmac
  • Author(s): Brad Crittenden
  • Date: 2013-08-23 22:01:47 UTC
  • mfrom: (358.1.14 official-bundle-json)
  • Revision ID: tarmac-20130823220147-z0pg084iaro0afyh
[r=sinzui][bug=1215473][author=bac] Support official/promulgated bundles.  Change bundle to store basket_name and basket_revision separately rather than as on combined basket_id with name/rev.  Always use 'bundles' in the path for web and api requests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmworld/tests/test_search.py
646
646
 
647
647
    def test_create_replacement_bundle_indexed_in_place(self):
648
648
        bundle_data = {'_id': 'a', 'name': 'foo', 'owner': 'bar',
649
 
                       'basket': 'basket', 'data': {'series': 'baz'}}
 
649
                       'basket_name': 'basket', 'data': {'series': 'baz'}}
650
650
        self.index_client.index_bundle(bundle_data)
651
651
        copy = self.index_client.create_replacement('index-copy')
652
652
        self.addCleanup(copy.delete_index)
673
673
 
674
674
    def test_create_replacement_bundles_replacing_old(self):
675
675
        bundle_data = {'_id': 'a', 'name': 'foo', 'owner': 'bar',
676
 
                       'series': 'first', 'basket': 'basket'}
 
676
                       'series': 'first', 'basket_name': 'basket'}
677
677
        bundle_data2 = {'_id': 'a', 'name': 'foo', 'owner': 'bar',
678
 
                        'series': 'second', 'basket': 'basket'}
 
678
                        'series': 'second', 'basket_name': 'basket'}
679
679
        self.index_client.index_bundle(bundle_data)
680
680
        copy = self.index_client.create_replacement(
681
681
            bundles=[bundle_data2])
898
898
 
899
899
    def test_only_one_revision_per_bundle(self):
900
900
        bundle_data = factory.get_bundle_data(
901
 
            owner='a', name='b', basket='c/1')
 
901
            owner='a', name='b', basket_with_rev='c/1')
902
902
        bundle_data_2 = factory.get_bundle_data(
903
 
            owner='a', name='b', basket='c/2')
 
903
            owner='a', name='b', basket_with_rev='c/2')
904
904
        self.index_client.index_bundle(bundle_data)
905
905
        self.index_client.index_bundle(bundle_data_2)
906
906
        self.assertEqual(['~a/c/2/b'], [b['data']['_id'] for b in