~landscape/landscape-client/trunk

« back to all changes in this revision

Viewing changes to landscape/broker/store.py

Merge fix-release-upgrader-not-asking-for-session-id [f=1401867] [r=tribaal,bjornt] [a=Free Ekanayaka]
This branch fixes the release upgrader to ask for a session ID before
attempting to send a message.

Unfortunately the test setUp was getting it by hand ignoring that real
code would not do the same.

Show diffs side-by-side

added added

removed removed

Lines of Context:
505
505
            # session-ids to one per scope.  The or condition here is not
506
506
            # strictly necessary, but we *should* do "is" comparisons when we
507
507
            # can (so says PEP 8).
508
 
            if scope is stored_scope or scope == stored_scope:
 
508
            if scope == stored_scope:
509
509
                return session_id
510
510
        session_id = str(uuid.uuid4())
511
511
        session_ids[session_id] = scope